Retouched new structure.

diff --git a/Doxyfile b/Doxyfile
new file mode 100644 (file)
index 0000000..af31650
--- /dev/null
+++ b/Doxyfile
@@ -0,0 +1,207 @@
+# Doxyfile 1.3.2
+
+#---------------------------------------------------------------------------
+# General configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = "BIFE Base"
+PROJECT_NUMBER         = 0.11
+OUTPUT_DIRECTORY       = api
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = YES
+EXTRACT_STATIC         = YES
+EXTRACT_LOCAL_CLASSES  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = YES
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+INTERNAL_DOCS          = YES
+CASE_SENSE_NAMES       = YES
+SHORT_NAMES            = NO
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+JAVADOC_AUTOBRIEF      = YES
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 4
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ALIASES                = 
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_DOC_ERROR      = YES
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = doxygen.warn
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = src
+FILE_PATTERNS          = *.php
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = YES
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = YES
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = YES
+TREEVIEW_WIDTH         = 200
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = YES
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = YES
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = YES
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+UML_LOOK               = YES
+TEMPLATE_RELATIONS     = YES
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = YES
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
+CGI_NAME               = search.cgi
+CGI_URL                = 
+DOC_URL                = 
+DOC_ABSPATH            = 
+BIN_ABSPATH            = /usr/local/bin/
+EXT_DOC_PATHS          = 

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..0da066a
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,41 @@
+# vim: set noexpandtab tabstop=4 softtabstop=4 shiftwidth=4:
+# +--------------------------------------------------------------------+
+# |                       BIFE - Buil It FastEr                        |
+# +--------------------------------------------------------------------+
+# | This file is part of BIFE.                                         |
+# |                                                                    |
+# | BIFE is free software; you can redistribute it and/or modify it    |
+# | under the terms of the GNU General Public License as published by  |
+# | the Free Software Foundation; either version 2 of the License, or  |
+# | (at your option) any later version.                                |
+# |                                                                    |
+# | BIFE is distributed in the hope that it will be useful, but        |
+# | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+# | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU   |
+# | General Public License for more details.                           |
+# |                                                                    |
+# | You should have received a copy of the GNU General Public License  |
+# | along with Hooks; if not, write to the Free Software Foundation,   |
+# | Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA      |
+# +--------------------------------------------------------------------+
+# | Created: Mon May 19 00:16:56 ART 2003                              |
+# | Authors: Leandro Lucarella <luca@lugmen.org.ar>                    |
+# +--------------------------------------------------------------------+
+#
+# $Id$
+#
+
+MODULE=base
+
+PHP_FILES=$(subst ./,,$(shell find src -name '*.php'))
+EXAMPLE_FILES=$(subst ./,,$(shell find examples -regex '.*\.svn.*'))
+DOC_FILES=README ROADMAP
+
+package: package.xml $(PHP_FILES) $(EXAMPLE_FILES) $(DOC_FILES)
+       pear package
+
+code: $(MODULE).xmi xmi2code.config
+       @xmi2code
+
+code-clean:
+       @find src -name '*.bak' | xargs rm -vf

diff --git a/README b/README
index 13737e007b38dfb3f8817b895b50f4f72af52df8..71b0cfafb55f4c838c601331c5417604348ec4b6 100644 (file)
--- a/README
+++ b/README
@@ -3,4 +3,4 @@ $Id$
 This is a basic implementation of BIFE to make a simple website or to use it
 to make more complex widgets.
 
 This is a basic implementation of BIFE to make a simple website or to use it
 to make more complex widgets.
 

-There's a tentative roadmap in ROADMAP.
+There's a tentative ROADMAP.

diff --git a/bife.xmi b/base.xmi
similarity index 95%
rename from bife.xmi
rename to base.xmi
index bdf7124415988fbb2f24abcbadb7d645b884d01e..3581fdef536902de61651a31166648b87d77fc42 100644 (file)
--- a/bife.xmi
+++ b/base.xmi
@@ -5,14 +5,14 @@
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
    <XMI.exporterVersion>1.1</XMI.exporterVersion>
   </XMI.documentation>
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
    <XMI.exporterVersion>1.1</XMI.exporterVersion>
   </XMI.documentation>

-  <XMI.model xmi.name="bife" href="/home/luca/website/www/test/bife/base/bife.xmi" />
+  <XMI.model xmi.name="base" href="/home/luca/website/www/test/bife/base/base.xmi" />

   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
   <docsettings viewid="2" documentation="Parse XML data getting widgets." uniqueid="159" />
   <umlobjects>
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
   <docsettings viewid="2" documentation="Parse XML data getting widgets." uniqueid="159" />
   <umlobjects>

-   <UML:Class stereotype="" package="BIFE" xmi.id="5" abstract="1" documentation="Base container widget class." name="Container" static="0" scope="200" />
-   <UML:Class stereotype="" package="BIFE" xmi.id="61" abstract="1" documentation="Fallback widget to use when no specific widget is implemented." name="Fallback" static="0" scope="200" />
+   <UML:Class stereotype="" package="BIFE" xmi.id="5" abstract="1" documentation="x2c:extern" name="Container" static="0" scope="200" />
+   <UML:Class stereotype="" package="BIFE" xmi.id="61" abstract="1" documentation="x2c:extern" name="Fallback" static="0" scope="200" />

    <UML:Class stereotype="" package="BIFE" xmi.id="7" abstract="0" documentation="This is a generic and simple (but very usefull) BIFE_Fallback implementation. Translate widgets using a template with it's name, prepended with 'bife_'. If not template is found, it copy the XML to the output." name="Translate" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="12" type="string" abstract="0" documentation="Renders the widget." name="render" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="&amp;HTML_Template_HIT" abstract="0" documentation="Template to use to render the widget." name="template" static="0" scope="200" />
    <UML:Class stereotype="" package="BIFE" xmi.id="7" abstract="0" documentation="This is a generic and simple (but very usefull) BIFE_Fallback implementation. Translate widgets using a template with it's name, prepended with 'bife_'. If not template is found, it copy the XML to the output." name="Translate" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="12" type="string" abstract="0" documentation="Renders the widget." name="render" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="&amp;HTML_Template_HIT" abstract="0" documentation="Template to use to render the widget." name="template" static="0" scope="200" />

diff --git a/examples/index.php b/examples/index.php
index c38ac9c098d524c35dd3903f19b0bb0e13ff0098..898334990513cce894c051b5c28fc0e4020ad2e8 100644 (file)
--- a/examples/index.php
+++ b/examples/index.php
@@ -26,9 +26,8 @@
 // $Id$
 //
 
 // $Id$
 //
 

-$tmp = ini_get('include_path');
-ini_set('include_path', "..:$tmp");
-unset($tmp);
+ini_set('include_path', '../src:../../hit/src:../../bife/src:',
+    ini_get('include_path'));

 umask('002');
 
 require_once 'HTML/Template/HIT.php';
 umask('002');
 
 require_once 'HTML/Template/HIT.php';

diff --git a/package.xml b/package.xml
index 3cfff25319bb1ddc49e8517646b9af171d96b3ee..03ff5effba9f6a98e371cd17458722da1c1ce6bd 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -24,16 +24,23 @@
         <provides type="class" name="BIFE_Translate"/>
         <filelist>
             <!-- PHP -->
         <provides type="class" name="BIFE_Translate"/>
         <filelist>
             <!-- PHP -->

-            <file role="php">BIFE/Link.php</file>
-            <file role="php">BIFE/Translate.php</file>
+            <dir name="/" baseinstalldir="BIFE" role="php">
+                <file install-as="Link.php" name="src/BIFE/Link.php"/>
+                <file install-as="Translate.php" name="src/BIFE/Translate.php"/>
+            </dir>

             <!-- DOC -->
             <!-- DOC -->

-            <file role="doc">README</file>
-            <file role="doc">ROADMAP</file>
-            <file role="doc">examples/index.php</file>
-            <file role="doc">examples/index.xbf</file>
-            <file role="doc">examples/templates/bife_page.tpl.html</file>
-            <file role="doc">examples/templates/bife_title.tpl.html</file>
-            <file role="doc">examples/templates/bife_link.tpl.html</file>
+            <dir name="/" role="doc">
+                <file>README</file>
+                <file>ROADMAP</file>
+            </dir>
+            <!-- EXAMPLES -->
+            <dir name="examples" role="doc">
+                <file>index.php</file>
+                <file>index.xbf</file>
+                <file>templates/bife_page.tpl.html</file>
+                <file>templates/bife_title.tpl.html</file>
+                <file>templates/bife_link.tpl.html</file>
+            </dir>

         </filelist>
     </release>
     <deps>
         </filelist>
     </release>
     <deps>

diff --git a/BIFE/Link.php b/src/BIFE/Link.php
similarity index 100%
rename from BIFE/Link.php
rename to src/BIFE/Link.php

diff --git a/BIFE/Translate.php b/src/BIFE/Translate.php
similarity index 100%
rename from BIFE/Translate.php
rename to src/BIFE/Translate.php

diff --git a/xmi2code.config b/xmi2code.config
index 7540819e770bd117dcf559aee19b494d8af5f7a1..6c6a5d34e95270cfbb527480da79548473358edc 100644 (file)
--- a/xmi2code.config
+++ b/xmi2code.config
@@ -34,7 +34,7 @@
   <option key="config-file" value="xmi2code.config"/>
   <option key="config-file-set" value="false"/>
   <option key="handler" value="umbrello"/>
   <option key="config-file" value="xmi2code.config"/>
   <option key="config-file-set" value="false"/>
   <option key="handler" value="umbrello"/>

-  <option key="generator-path" value="."/>
+  <option key="generator-path" value="src"/>

   <option key="use-package-as-dir" value="true"/>
   <option key="indent" value="    "/>
   <option key="files-case" value="preserve"/>
   <option key="use-package-as-dir" value="true"/>
   <option key="indent" value="    "/>
   <option key="files-case" value="preserve"/>