From turbine-tdk-dev-returncarrricky@example.org Fri Jun 08 17:09:04 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 4014 invoked by uid 500); 8 Jun 2001 17:09:00 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 3953 invoked by uid 500); 8 Jun 2001 17:08:57 -0000
Delivered-To: carrricky@example.org
Date: 8 Jun 2001 17:08:57 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/share/sample/templates/app/navigations Menu.vm

jvanzyl     01/06/08 10:08:56

  Modified:    src      build.xml
               src/share/sample/conf project-schema.xml
               src/share/sample/templates/app/navigations Menu.vm
  Log:
  - extending the xml database schema to use the <app-data>
    tags
  - specify the database name using the 'name' attribute
  - use the defaultIdMethod attribute in the <database> tag
  
  Revision  Changes    Path
  1.12      +2 -1      jakarta-turbine-tdk/src/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/build.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- build.xml	2001/05/28 23:43:00	1.11
  +++ build.xml	2001/06/08 17:08:53	1.12
  @@ -153,7 +153,7 @@
     <!-- ================================================================= -->
     <!-- T U R B I N E  S C H E M A S                                      -->
     <!-- ================================================================= -->
  -  
  +
     <target name="turbine-schemas">
       <copy todir="${app.conf}">
         <fileset dir="${share.dir}/conf/master">
  @@ -230,6 +230,7 @@
     <!-- ================================================================= -->
   
     <target name="conf">
  +    <filter token="PROJECT" value="${turbine.app}"/>
       <copy todir="${app.conf}" filtering="yes">
         <fileset dir="${app.root.conf}"/>
       </copy>
  
  
  
  1.2       +8 -2      jakarta-turbine-tdk/src/share/sample/conf/project-schema.xml
  
  Index: project-schema.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample/conf/project-schema.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project-schema.xml	2001/05/27 22:35:32	1.1
  +++ project-schema.xml	2001/06/08 17:08:55	1.2
  @@ -6,13 +6,19 @@
   <!-- This is an example Turbine project schema.                           -->
   <!-- ==================================================================== -->
   
  -<database>
  +<app-data>
  +
  +<database name="@PROJECT@" defaultIdMethod="idBroker">
  +  
     <table name="RDF">
  -    <column name="RDF_ID" required="true" autoIncrement="true" primaryKey="true" type="INTEGER"/>
  +    <column name="RDF_ID" required="true" primaryKey="true" type="INTEGER"/>
       <column name="TITLE" size="255" type="VARCHAR"/>
       <column name="BODY" size="255" type="VARCHAR"/>
       <column name="URL" size="255" type="VARCHAR"/>
       <column name="AUTHOR" size="255" type="VARCHAR"/>
       <column name="DEPT" size="255" type="VARCHAR"/>
     </table>
  +
   </database>
  +
  +</app-data>
  
  
  
  1.2       +2 -2      jakarta-turbine-tdk/src/share/sample/templates/app/navigations/Menu.vm
  
  Index: Menu.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample/templates/app/navigations/Menu.vm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Menu.vm	2001/05/25 06:27:47	1.1
  +++ Menu.vm	2001/06/08 17:08:56	1.2
  @@ -23,8 +23,8 @@
   <br>
   <a href="$link.setPage("Upload.vm")">Upload Service</a>
   <br>
  -##<a href="">Servlet Service</a>
  -##<br>
  +<a href="$link.setPage("ServletInfo.vm")">Servlet Service</a>
  +<br>
   ##<a href="">Unique Id Service</a>
   ##<br>
   ##<a href="">XML-RPC Service</a>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Fri Jun 08 20:39:12 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 32365 invoked by uid 500); 8 Jun 2001 20:39:10 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 32321 invoked by uid 500); 8 Jun 2001 20:39:09 -0000
Delivered-To: carrricky@example.org
Date: 8 Jun 2001 20:39:08 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src build.properties

jvanzyl     01/06/08 13:39:08

  Modified:    src      build.properties
  Log:
  - avoid some confusion by stating what the properties are
    actually for.
  
  Revision  Changes    Path
  1.4       +6 -0      jakarta-turbine-tdk/src/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/build.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.properties	2001/05/28 23:43:00	1.3
  +++ build.properties	2001/06/08 20:39:07	1.4
  @@ -8,6 +8,12 @@
   target.package = org.mycompany.newapp
   target.directory = org/mycompany/newapp
   
  +
  +# -------------------------------------------------------------------------
  +# As a user of the TDK you do not need to edit these.
  +# This is for external turbine app integration.
  +# -------------------------------------------------------------------------
  +
   tdk.home = .
   app.root = share/sample
   share.dir = share
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Sat Jun 09 06:08:44 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 97539 invoked by uid 500); 9 Jun 2001 06:08:39 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 97526 invoked by uid 500); 9 Jun 2001 06:08:37 -0000
Delivered-To: carrricky@example.org
Date: 9 Jun 2001 06:08:36 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/share/sample/templates/app/screens Error.vm

jvanzyl     01/06/08 23:08:35

  Modified:    src/share/sample/templates/app/screens Error.vm
  Log:
  - display the stacktrace and processing exception, didn't notice
    the Error.vm template is practically useless until i started
    testing the services. i'm surprised no reported this one. the
    template as it was, was useless. sorry about that.
  
  Revision  Changes    Path
  1.2       +5 -3      jakarta-turbine-tdk/src/share/sample/templates/app/screens/Error.vm
  
  Index: Error.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample/templates/app/screens/Error.vm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Error.vm	2001/05/25 06:27:47	1.1
  +++ Error.vm	2001/06/09 06:08:34	1.2
  @@ -6,9 +6,11 @@
   
   <h2>Error</h2>
   
  -#if($data.getMessage())
  -Message: $data.getMessage()
  -#end
  +$processingException
  +
  +<hr>
  +
  +$stackTrace
   
   </font>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Sat Jun 09 23:41:54 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 22003 invoked by uid 500); 9 Jun 2001 23:41:53 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 21992 invoked by uid 500); 9 Jun 2001 23:41:53 -0000
Delivered-To: carrricky@example.org
Date: 9 Jun 2001 23:41:53 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/lib jstyle.jar

jvanzyl     01/06/09 16:41:53

  Added:       lib      jstyle.jar
  Log:
  - added a modified Jstyle jar so that it will work with
    a newly created ant task that will format the sources
    that torque generates. works as follows:
  
    <taskdef name="format-source" classname="jstyle.FormatTask">
      <classpath refid="classpath"/>
    </taskdef>
  
    <format>
      <fileset dir="${src.dir}">
        <include name="**/*.java"/>
      </fileset>
    </format>
  
  Revision  Changes    Path
  1.1                  jakarta-turbine-tdk/lib/jstyle.jar
  
  	<<Binary file>>
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Tue Jun 12 18:05:01 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 10629 invoked by uid 500); 12 Jun 2001 18:04:31 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 10488 invoked from network); 12 Jun 2001 18:04:08 -0000
X-Apparently-From: <carrricky@example.org>
Message-ID: <carrricky@example.org>
Reply-To: "Greg Coladonato" <carrricky@example.org>
From: "Greg Coladonato" <carrricky@example.org>
To: <carrricky@example.org>
Subject: [PATCH] GETTING_STARTED.txt
Date: Tue, 12 Jun 2001 11:01:59 -0700
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="----=_NextPart_000_020D_01C0F32F.19FE90E0"
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 5.50.4133.2400
X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400
X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N

------=_NextPart_000_020D_01C0F32F.19FE90E0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

If I'm not mistaken, I just noticed some outdated text in this file. Patch
attached.

Greg

------=_NextPart_000_020D_01C0F32F.19FE90E0
Content-Type: text/plain;
	name="GETTING_STARTED.txt"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="GETTING_STARTED.txt"

Index: GETTING_STARTED.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/jakarta-turbine-tdk/src/share/sample/build/GETTING_STARTE=
D.txt,v
retrieving revision 1.2
diff -u -r1.2 GETTING_STARTED.txt
--- GETTING_STARTED.txt	2001/05/29 01:22:57	1.2
+++ GETTING_STARTED.txt	2001/06/12 05:46:36
@@ -4,26 +4,24 @@
=20
 Hey! You made it!
=20
-To get the sample peer application running you must edit
-a few properties in your ./project/newapp.properties file
-and run the "init" target in the provided Ant build file.
+To get the sample application running you must edit
+a few properties in the build.properties file and run
+the "init" target in the provided Ant build file.
=20
 YOU MUST RUN THE INITIALIZATION TARGET OR NOTHING
 WILL WORK!!! YOU HAVE BEEN WARNED!!
=20
-You must edit the following properties in your
-./project/newapp.properties file:
+You must edit the following properties in the=20
+build.properties file:
=20
 database
-targetPlatform
-targetPlatformExt
 databaseUrl
 databaseDriver
 databaseUser
 databasePassword
=20
-There is documentation inside your ./project/newapp.properties
-file describing your options in each case.
+There is documentation inside the build.properties file=20
+describing your options in each case.
=20
 After you have edited your properties, you should run the
 initialization target of your build file:


------=_NextPart_000_020D_01C0F32F.19FE90E0
Content-Type: text/plain; charset=us-ascii

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org
------=_NextPart_000_020D_01C0F32F.19FE90E0--


_________________________________________________________
Do You Yahoo!?
Get your free @yahoo.com address at http://mail.yahoo.com


From turbine-tdk-dev-returncarrricky@example.org Fri Jun 15 20:45:25 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 17868 invoked by uid 500); 15 Jun 2001 20:45:21 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 17740 invoked by uid 500); 15 Jun 2001 20:45:19 -0000
Delivered-To: carrricky@example.org
Date: 15 Jun 2001 20:45:18 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/share/sample/build build.xml

jvanzyl     01/06/15 13:45:18

  Modified:    src/share/sample/build build.xml
  Log:
  - fixing some errors in the docs.
  
  Revision  Changes    Path
  1.7       +23 -2     jakarta-turbine-tdk/src/share/sample/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample/build/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	2001/05/29 15:09:52	1.6
  +++ build.xml	2001/06/15 20:45:16	1.7
  @@ -22,7 +22,7 @@
     
     <property name="final.name" value="${project}-${version}"/>
     <property name="final.dir" value="../${final.name}/"/>
  -  
  +
     <!-- ================================================================ -->
     <!-- I N I T  T A S K  T A R G E T                                    -->
     <!-- ================================================================ -->
  @@ -56,7 +56,12 @@
         classname="org.apache.velocity.texen.ant.TexenTask">
         <classpath refid="classpath"/>
       </taskdef>
  -  
  +    
  +    <taskdef name="format-source"
  +      classname="jstyle.FormatTask">
  +      <classpath refid="classpath"/>
  +    </taskdef>
  +
     </target>
   
     <!-- ================================================================ -->
  @@ -177,6 +182,12 @@
         xmlFile="${schemaDirectory}/${project}-schema.xml"
       />
   
  +    <format-source>
  +      <fileset dir="${src.dir}/${targetDirectory}">
  +        <include name="**/*.java"/>
  +      </fileset>
  +    </format-source>
  +
     </target>
     
     <!-- ================================================================ -->
  @@ -385,6 +396,16 @@
       <filter token="DATABASE_URL" value="${databaseUrl}"/>
       <filter token="DATABASE_USER" value="${databaseUser}"/>
       <filter token="DATABASE_PASSWORD" value="${databasePassword}"/>
  +    
  +    <!--
  +    
  +    Leave this set to "default" until we figure out how
  +    to get this value as a torque property.
  +    
  +    <filter token="DATABASE_DEFAULT" value="${project}"/>
  +    -->
  +    
  +    <filter token="DATABASE_DEFAULT" value="default"/>
       
       <property name="database.descriptor" value="${master.conf.dir}/database/${database}"/>
       <property name="database.name" value="${project}"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Sat Jun 16 15:49:58 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 30914 invoked by uid 500); 16 Jun 2001 15:49:55 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 30902 invoked by uid 500); 16 Jun 2001 15:49:53 -0000
Delivered-To: carrricky@example.org
Date: 16 Jun 2001 15:49:52 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/share/sample/build GETTING_STARTED.txt build.properties build.xml

jvanzyl     01/06/16 08:49:52

  Modified:    src/share/sample/build GETTING_STARTED.txt build.properties
                        build.xml
  Log:
  - adding a 'project' target that can be used when the project XML
    schema is changed for a project. this target will take care of
    running the following targets:
  
    project-sql
    project-id-table-init-sql
    project-insert-sql
    project-om
    compile
  
  Revision  Changes    Path
  1.3       +2 -4      jakarta-turbine-tdk/src/share/sample/build/GETTING_STARTED.txt
  
  Index: GETTING_STARTED.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample/build/GETTING_STARTED.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- GETTING_STARTED.txt	2001/05/29 01:22:57	1.2
  +++ GETTING_STARTED.txt	2001/06/16 15:49:48	1.3
  @@ -12,17 +12,15 @@
   WILL WORK!!! YOU HAVE BEEN WARNED!!
   
   You must edit the following properties in your
  -./project/newapp.properties file:
  +build.properties file:
   
   database
  -targetPlatform
  -targetPlatformExt
   databaseUrl
   databaseDriver
   databaseUser
   databasePassword
   
  -There is documentation inside your ./project/newapp.properties
  +There is documentation inside your build.properties
   file describing your options in each case.
   
   After you have edited your properties, you should run the
  
  
  
  1.3       +1 -0      jakarta-turbine-tdk/src/share/sample/build/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample/build/build.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.properties	2001/05/28 22:12:52	1.2
  +++ build.properties	2001/06/16 15:49:48	1.3
  @@ -51,6 +51,7 @@
   mapname=TurbineMap
   suffix=MapBuilder
   targetPackage=@TARGET_PACKAGE@.om
  +targetDirectory=@TARGET_DIRECTORY@/om
   addSaveMethod=true
   addGetByNameMethod=false
   complexObjectModel=true
  
  
  
  1.8       +18 -4     jakarta-turbine-tdk/src/share/sample/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample/build/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.xml	2001/06/15 20:45:16	1.7
  +++ build.xml	2001/06/16 15:49:48	1.8
  @@ -81,15 +81,29 @@
       <antcall target="turbine-security-sql"/>
       <antcall target="turbine-insert-sql"/>
       
  +    <antcall target="project"/>
  +    
  +    <antcall target="update-tr-props"/>
  +    
  +  </target>
  +
  +
  +  <!-- ================================================================ -->
  +  <!-- P R O J E C T                                                    -->
  +  <!-- ================================================================ -->
  +  <!-- This target runs all the targets required when changes           -->
  +  <!-- are made to the project XML database schema.                     -->
  +  <!-- ================================================================ -->
  +
  +  <target name="project" description="--> run when XML schema is changed">
  +
       <antcall target="project-sql"/>
       <antcall target="project-id-table-init-sql"/>
       <antcall target="project-insert-sql"/>
       <antcall target="project-om"/>
  -    
  -    <antcall target="update-tr-props"/>
       <antcall target="compile"/>
  -  
  -  </target>
  +
  +  </target>                
   
     <!-- ================================================================ -->
     <!-- C R E A T E  T A R G E T  D A T A B A S E                        -->
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Tue Jun 19 14:03:00 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 183 invoked by uid 500); 19 Jun 2001 14:02:54 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Delivered-To: moderator for carrricky@example.org
Received: (qmail 91994 invoked by uid 500); 19 Jun 2001 12:17:40 -0000
Delivered-To: carrricky@example.org
Date: 19 Jun 2001 12:17:40 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/build build.xml

mpoeschl    01/06/19 05:17:40

  Modified:    build    build.xml
  Log:
  add target-descriptions
  
  Revision  Changes    Path
  1.13      +4 -2      jakarta-turbine-tdk/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/build/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml	2001/05/27 17:06:41	1.12
  +++ build.xml	2001/06/19 12:17:39	1.13
  @@ -310,7 +310,8 @@
     <!-- an attempt to keep the size down while testing.                     -->
     <!-- =================================================================== -->
   
  -  <target name="test-dist" depends="prepare">
  +  <target name="test-dist" depends="prepare" 
  +          description="--> generates the TDK without docs">
     </target>
   
     <!-- =================================================================== -->
  @@ -319,7 +320,8 @@
     <!-- This is a fully functional TDK distribution                         -->
     <!-- =================================================================== -->
   
  -  <target name="production-dist" depends="docs,test-dist">
  +  <target name="production-dist" depends="docs,test-dist"
  +          description="--> generates the full TDK distribution">
       <property name="tmp.name" value="tdk-${tdk.version}"/>
   
       <replace file="${tdk.dist}/conf/server.xml">
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Tue Jun 19 23:51:11 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 34449 invoked by uid 500); 19 Jun 2001 23:51:10 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 34438 invoked by uid 500); 19 Jun 2001 23:51:10 -0000
Delivered-To: carrricky@example.org
Date: 19 Jun 2001 23:51:10 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/share/sample/templates/app/screens BSF.vm

jvanzyl     01/06/19 16:51:10

  Added:       src/share/sample/templates/app/screens BSF.vm
  Log:
  - simple example of how to use the bsf service. this template doesn't
    actually do anything ... it just tells the user something was
    printed on the console.
  
  Revision  Changes    Path
  1.1                  jakarta-turbine-tdk/src/share/sample/templates/app/screens/BSF.vm
  
  Index: BSF.vm
  ===================================================================
  A python script was executed!
  
  <p>
  
  'Hello World!' should have appeared on your console!
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Tue Jun 19 23:52:43 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 35143 invoked by uid 500); 19 Jun 2001 23:52:43 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 35132 invoked by uid 500); 19 Jun 2001 23:52:42 -0000
Delivered-To: carrricky@example.org
Date: 19 Jun 2001 23:52:42 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/share/sample/src/java/modules/screens BSF.java

jvanzyl     01/06/19 16:52:42

  Added:       src/share/sample/src/java/modules/screens BSF.java
  Log:
  - simple example using the bsf service. just executes a hello world
    python script.
  
  Revision  Changes    Path
  1.1                  jakarta-turbine-tdk/src/share/sample/src/java/modules/screens/BSF.java
  
  Index: BSF.java
  ===================================================================
  package @TARGET_PACKAGE@.modules.screens;
  
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" and 
   *    "Apache Turbine" must not be used to endorse or promote products 
   *    derived from this software without prior written permission. For 
   *    written permission, please contact carrricky@example.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    "Apache Turbine", nor may "Apache" appear in their name, without 
   *    prior written permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  import org.apache.turbine.util.RunData;
  import org.apache.velocity.context.Context;
  
  import org.apache.turbine.services.bsf.TurbineBSF;
  
  /**
   * Grab all the records in a table using a Peer, and
   * place the Vector of data objects in the context
   * where they can be displayed by a #foreach loop.
   *
   * @author <a href="mailto:carrricky@example.org">Jason van Zyl</a>
   */
  public class BSF extends SecureScreen
  {
      /**
       * Place all the data object in the context
       * for use in the template.
       */
      public void doBuildTemplate( RunData data, Context context )
      {
          TurbineBSF.execute("helloWorld");        
      }
  }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Tue Jun 19 23:53:39 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 35395 invoked by uid 500); 19 Jun 2001 23:53:38 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 35384 invoked by uid 500); 19 Jun 2001 23:53:38 -0000
Delivered-To: carrricky@example.org
Date: 19 Jun 2001 23:53:38 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/share/sample/scripts - New directory

jvanzyl     01/06/19 16:53:38

  jakarta-turbine-tdk/src/share/sample/scripts - New directory

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Tue Jun 19 23:54:16 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 35615 invoked by uid 500); 19 Jun 2001 23:54:16 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 35601 invoked by uid 500); 19 Jun 2001 23:54:16 -0000
Delivered-To: carrricky@example.org
Date: 19 Jun 2001 23:54:16 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/share/sample/scripts helloWorld.py

jvanzyl     01/06/19 16:54:16

  Added:       src/share/sample/scripts helloWorld.py
  Log:
  - the most basic python script that displays the use of the BSFService.
  
  Revision  Changes    Path
  1.1                  jakarta-turbine-tdk/src/share/sample/scripts/helloWorld.py
  
  Index: helloWorld.py
  ===================================================================
  print 'hello world!'
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Wed Jun 20 20:29:52 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 934 invoked by uid 500); 20 Jun 2001 20:29:46 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 916 invoked by uid 500); 20 Jun 2001 20:29:44 -0000
Delivered-To: carrricky@example.org
Date: 20 Jun 2001 20:29:42 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/src - New directory

jvanzyl     01/06/20 13:29:42

  jakarta-turbine-tdk/src/src - New directory

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Wed Jun 20 20:29:55 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 988 invoked by uid 500); 20 Jun 2001 20:29:53 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 968 invoked by uid 500); 20 Jun 2001 20:29:51 -0000
Delivered-To: carrricky@example.org
Date: 20 Jun 2001 20:29:50 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/src/java - New directory

jvanzyl     01/06/20 13:29:50

  jakarta-turbine-tdk/src/src/java - New directory

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Wed Jun 20 20:30:02 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 1214 invoked by uid 500); 20 Jun 2001 20:29:59 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 1199 invoked by uid 500); 20 Jun 2001 20:29:58 -0000
Delivered-To: carrricky@example.org
Date: 20 Jun 2001 20:29:57 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/src/java/org - New directory

jvanzyl     01/06/20 13:29:57

  jakarta-turbine-tdk/src/src/java/org - New directory

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Wed Jun 20 20:30:09 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 1405 invoked by uid 500); 20 Jun 2001 20:30:07 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 1385 invoked by uid 500); 20 Jun 2001 20:30:06 -0000
Delivered-To: carrricky@example.org
Date: 20 Jun 2001 20:30:05 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/src/java/org/apache - New directory

jvanzyl     01/06/20 13:30:05

  jakarta-turbine-tdk/src/src/java/org/apache - New directory

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Wed Jun 20 20:30:17 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 1577 invoked by uid 500); 20 Jun 2001 20:30:15 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 1536 invoked by uid 500); 20 Jun 2001 20:30:13 -0000
Delivered-To: carrricky@example.org
Date: 20 Jun 2001 20:30:12 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/src/java/org/apache/turbine - New directory

jvanzyl     01/06/20 13:30:12

  jakarta-turbine-tdk/src/src/java/org/apache/turbine - New directory

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Wed Jun 20 20:30:43 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 1925 invoked by uid 500); 20 Jun 2001 20:30:42 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 1901 invoked by uid 500); 20 Jun 2001 20:30:41 -0000
Delivered-To: carrricky@example.org
Date: 20 Jun 2001 20:30:39 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/src/java/org/apache/turbine/tools - New directory

jvanzyl     01/06/20 13:30:39

  jakarta-turbine-tdk/src/src/java/org/apache/turbine/tools - New directory

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Wed Jun 20 20:31:39 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 2473 invoked by uid 500); 20 Jun 2001 20:31:37 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 2449 invoked by uid 500); 20 Jun 2001 20:31:35 -0000
Delivered-To: carrricky@example.org
Date: 20 Jun 2001 20:31:34 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/src/java/org/apache/turbine/tools Migrator.java

jvanzyl     01/06/20 13:31:34

  Added:       src/src/java/org/apache/turbine/tools Migrator.java
  Log:
  - moving here and removing from the turbine tree.
  
  Revision  Changes    Path
  1.1                  jakarta-turbine-tdk/src/src/java/org/apache/turbine/tools/Migrator.java
  
  Index: Migrator.java
  ===================================================================
  package org.apache.turbine.tools;
  
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" and 
   *    "Apache Turbine" must not be used to endorse or promote products 
   *    derived from this software without prior written permission. For 
   *    written permission, please contact carrricky@example.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    "Apache Turbine", nor may "Apache" appear in their name, without 
   *    prior written permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  import java.io.File;
  import java.io.FileWriter;
  
  import org.apache.oro.text.perl.Perl5Util;
  import org.apache.velocity.util.StringUtils;
  import org.apache.tools.ant.DirectoryScanner;
  
  /**
   * This utility class attempts to help Turbine developers migrate
   * their wepapp sources across versions of Turbine by applying
   * a series of regexes and rules to a source tree and creates
   * a new source tree that is compatible with subsequent
   * releases of Turbine.
   *
   * @author <a href="mailto:carrricky@example.org">Jason van Zyl</a>
   * 
   * @version $Id: Migrator.java,v 1.1 2001/06/20 20:31:33 jvanzyl Exp $
   */
  public class Migrator
  {
      /**
       * Source file currently being migrated.
       */
      protected String originalSourceFile;
  
      /**
       * Regular expression tool 
       */
      protected Perl5Util perl;
      
      /** 
       * Path separator property 
       */
      protected String pathSeparator = File.separator;
      
      /*
       * The regexes to use for substition. The regexes come
       * in pairs. The first is the string to match, the
       * second is the substitution to make.
       *
       * These have to be taken from a configuration file
       * and we have to store the regexes in groups according
       * to what version of Turbine they can be applied to.
       *
       * Should be taken from an XML file, or a configuration
       * file.
       */
      protected String[] res =
      {
          // Make #if directive match the Velocity directive style.
          "#if\\s*[(]\\s*(.*\\S)\\s*[)]\\s*(#begin|{)[ \\t]?",
          "#if( $1 )",
  
          // Remove the WM #end #else #begin usage.
          "[ \\t]?(#end|})\\s*#else\\s*(#begin|{)[ \\t]?(\\w)",
          "#else#**#$3", // avoid touching a followup word with embedded comment
          "[ \\t]?(#end|})\\s*#else\\s*(#begin|{)[ \\t]?",
          "#else",
  
          // Convert WM style #foreach to Velocity directive style.
          "#foreach\\s+(\\$\\w+)\\s+in\\s+(\\$[^\\s#]+)\\s*(#begin|{)[ \\t]?",
          "#foreach( $1 in $2 )",
  
          // Change the "}" to #end. Have to get more
          // sophisticated here. Will assume either {}
          // and no javascript, or #begin/#end with the
          // possibility of javascript.
          "\n}", // assumes that javascript is indented, WMs not!!!
          "\n#end",
          
          // Convert WM style #set to Velocity directive style.
          "#set\\s+(\\$[^\\s=]+)\\s*=\\s*(.*\\S)[ \\t]*",
          "#set( $1 = $2 )",
          "(##[# \\t\\w]*)\\)", // fix comments included at end of line
          ")$1",
  
          // Convert WM style #parse to Velocity directive style.
          "#parse\\s+([^\\s#]+)[ \\t]?",
          "#parse( $1 )",
  
          // Convert WM style #include to Velocity directive style.
          "#include\\s+([^\\s#]+)[ \\t]?",
          "#include( $1 )",
  
          // Convert WM formal reference to VL syntax.
          "\\$\\(([^\\)]+)\\)",
          "${$1}",
          "\\${([^}\\(]+)\\(([^}]+)}\\)", // fix encapsulated brakets: {(})
          "${$1($2)}",
  
          // Velocity currently does not permit leading underscore.
          "\\$_",
          "$l_",
          "\\${(_[^}]+)}", // within a formal reference
          "${l$1}",
              
          // Change extensions when seen.
          "\\.wm",
          ".vm"
      };
      
      /**
       * Iterate through the set of find/replace regexes
       * that will convert a given source tree from one
       */
      public void migrate(String args[])
      {
          if (args.length < 1)
          {
              usage();
          }            
          
          File file = new File(args[0]);
          
          if (!file.exists())
          {
              System.err.println(
                  "The specified template or directory does not exist");
              
              System.exit(1);
          }
          
          if (file.isDirectory())
          {
              String basedir = args[0];
              String newBasedir = basedir + ".new";
              
              DirectoryScanner ds = new DirectoryScanner();
              ds.setBasedir(basedir);
              ds.addDefaultExcludes();
              ds.scan();
              String[] files = ds.getIncludedFiles();
              
              for (int i = 0; i < files.length; i++)
              {
                  writeSource(files[i], basedir, newBasedir);
              }                
          }
          else
          {
              writeSource(args[0], "", "");
          }
      }
  
      /**
       * Write out the converted template to the given named file
       * and base directory.
       */
      private boolean writeSource(String file, String basedir, String newBasedir)
      {
          System.out.println("Converting " + file + "...");
          
          String sourceFile;
          String sourceDir;
          String newSourceFile;
          File outputDirectory;
          
          if (basedir.length() == 0)
          {
              sourceFile = file;
              sourceDir = "";
              newSourceFile = file;
          }            
          else
          {
              sourceFile = basedir + pathSeparator + file;
              sourceDir = newBasedir + pathSeparator + 
                  file.substring(0, file.lastIndexOf(pathSeparator));
          
              outputDirectory = new File(sourceDir);
                  
              if (! outputDirectory.exists())
              {
                  outputDirectory.mkdirs();
              }                
                  
              newSourceFile = newBasedir + pathSeparator + file;
          }            
          
          String convertedSourceFile = convertSourceFile(sourceFile);
                      
          try
          {
              FileWriter fw = new FileWriter(newSourceFile);
              fw.write(convertedSourceFile);
              fw.close();
          }
          catch (Exception e)
          {
              e.printStackTrace();
          }
      
          return true;
      }
  
      /**
       * How to use this little puppy :-)
       */
      public void usage()
      {
          System.err.println("Usage: directory");
          System.exit(1);
      }
  
      /**
       * Apply find/replace regexes to our Turbine source file.
       *
       * @param String source file to migrate.
       * @return String migrated source file.
       */
      public String convertSourceFile(String sourceFile)
      {
          originalSourceFile = StringUtils.fileContentsToString(sourceFile);
  
          /*
           * overcome current velocity 0.71 limitation.
           * Hmm. Not sure if this applies to source files.
           * I will try this.
           */
          if ( !originalSourceFile.endsWith("\n") )
          {
            originalSourceFile += "\n";
          }          
  
          perl = new Perl5Util();
          for (int i = 0; i < res.length; i += 2)
          {
              while (perl.match("/" + res[i] + "/", originalSourceFile))
              {
                  originalSourceFile = perl.substitute(
                      "s/" + res[i] + "/" + res[i+1] + "/", originalSourceFile);
              }
          }
  
          return originalSourceFile;
      }
  
      /**
       * Main hook for the conversion process.
       */
      public static void main(String[] args)
      {
          Migrator migrator = new Migrator();
          migrator.migrate(args);
      }
  }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Wed Jun 20 20:35:39 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 6372 invoked by uid 500); 20 Jun 2001 20:34:51 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 5852 invoked by uid 500); 20 Jun 2001 20:33:52 -0000
Delivered-To: carrricky@example.org
Date: 20 Jun 2001 20:33:02 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/src/java/org/apache/turbine/tools ImportStatements.java

jvanzyl     01/06/20 13:33:01

  Added:       src/src/java/org/apache/turbine/tools ImportStatements.java
  Log:
  - adding import statement tool here.
  
  Revision  Changes    Path
  1.1                  jakarta-turbine-tdk/src/src/java/org/apache/turbine/tools/ImportStatements.java
  
  Index: ImportStatements.java
  ===================================================================
  package org.apache.turbine.tools;
  
  import de.fub.bytecode.Repository;
  import de.fub.bytecode.classfile.ClassParser;
  import de.fub.bytecode.classfile.Code;
  import de.fub.bytecode.classfile.Constant;
  import de.fub.bytecode.classfile.ConstantClass;
  import de.fub.bytecode.classfile.ConstantPool;
  import de.fub.bytecode.classfile.ConstantUtf8;
  import de.fub.bytecode.classfile.ConstantCP;
  import de.fub.bytecode.classfile.ConstantMethodref;
  import de.fub.bytecode.classfile.ConstantInterfaceMethodref;
  import de.fub.bytecode.classfile.ConstantNameAndType;
  import de.fub.bytecode.classfile.JavaClass;
  import de.fub.bytecode.classfile.LocalVariable;
  import de.fub.bytecode.classfile.LocalVariableTable;
  import de.fub.bytecode.classfile.Method;
  import de.fub.bytecode.classfile.Utility;
  
  import java.io.PrintStream;
  
  import java.util.Collection;
  import java.util.Hashtable;
  import java.util.Iterator;
  import java.util.TreeMap;
  
  /**
   * Utility class for creating a list of fully qualified
   * import statements.
   *
   * Class fields
   * Method return types
   * Method argument types
   * Method local variables
   * Static method references
   *
   * @author <a href="mailto:carrricky@example.org">Jason van Zyl</a>
   *
   * Problems:
   *
   * TurbineConfig.java:
   * initParams.put(TurbineServices.PROPERTIES_PATH_KEY, properties);
   * TurbineServices is not picked up.
   *
   * public RequestDispatcher getNamedDispatcher( String s)
   * RequestDispatcher is not picked up. weird.
   *
   * public Servlet getServlet(String s)
   * Servlet is not picked up. weird.
   *
   * StringStackBuffer.java:
   * pulling in java.util.AbstractList & java.util.Vector
   * when not required. Looks like a superclass problem.
   *
   * Check return values on public methods.
   *
   * SecurityCheck.java:
   * pulling in org.apache.turbine.util.security.AccessControlList
   *
   * RunData.java
   * totally screwed up. looks like an interface thang. though i got that.
   * oh the joys of dep checking.
   */
  public class ImportStatements
  {
      public ImportStatements(String className)
      {
          execute(className);
      }
      
      public void execute(String className)
      {
          Hashtable classes = new Hashtable();
      
          try
          {
              TreeMap classNames = new TreeMap();
              classNames.putAll(classReferences(className));
              classNames.putAll(localVariables(className));
              
              /*
               * Don't need reference to the class
               * being analysed.
               */
              classNames.remove(className);            
              
              Iterator iterator = classNames.values().iterator();
              StringBuffer sb = new StringBuffer();
              while (iterator.hasNext())
              {
                  String signature = (String) iterator.next();
                  
                  /*
                   *  Get rid of imports that are of the form
                   * import java.lang.X;
                   */
                  if (signature.indexOf("java.lang.") != -1)
                  {
                      if (signature.substring("java.lang.".length()).indexOf(".") == -1)
                      {
                          continue;
                      }                        
                  }
                  
                  if (basePackage(className).equals(basePackage(signature)))
                  {
                      continue;
                  }                    
                  
                  /*
                   * We also need to get rid of imports for classes
                   * in the same package as the class being
                   * analysed.
                   */
                  
                  sb.append("import ")
                    .append(signature)
                    .append(";")
                    .append("\n");
              }                
          
              System.out.println(sb);
          }
          catch(Exception e)
          {
              e.printStackTrace();
          }
      }
  
      private String basePackage(String className)
      {
          return className.substring(0, className.lastIndexOf(".") - 1);
      }
  
      /**
       * Resolve all class references in a class file by
       * examining the constant pool in the class.
       *
       * @param String className
       * @return Hashtable Fully qualified class references.
       */
      public static Hashtable classReferences(String className) 
          throws Exception
      {
          JavaClass javaClass;
          
          if ((javaClass = Repository.lookupClass(className)) == null)
          {
              javaClass = new ClassParser(className).parse();
          }            
          
          ConstantPool constantPool = javaClass.getConstantPool();
                          
          return processConstantPool(constantPool);
      }
      
      /**
       * Determine the class references in a constant pool.
       *
       * @param ConstantPool constant pool
       * @return Hashtable class references
       */
      private static Hashtable processConstantPool(ConstantPool constantPool)
      {
          Hashtable classReferences = new Hashtable();
          Constant[] constantPoolArray = constantPool.getConstantPool();
          String signature;
          int index;
          
          for (int i = 0; i < constantPoolArray.length; i++)
          {
              if (constantPoolArray[i] instanceof ConstantClass)
              {
                  index = ((ConstantClass) 
                      constantPoolArray[i]).getNameIndex();
                  
                  ConstantUtf8 constant = (ConstantUtf8) 
                      constantPool.getConstant(index);
                  
                  signature = new String(constant.getBytes());
                  signature = signature.replace('/', '.');
                  
                  if (signature.startsWith("L") && signature.endsWith(";"))
                  {
                      /*
                       * Reference of the form Ljava.util.Hashtable;
                       */
                      signature = signature.substring(1,signature.length()-1);
                  } 
                  else if (signature.startsWith("[L") && signature.endsWith(";"))
                  {
                      /*
                       * Reference of the form Ljava.util.Hashtable;
                       */
                      signature = signature.substring(2,signature.length()-1);
                  } 
                  else if (signature.startsWith("["))
                  {
                      continue;
                  }
                  else if (signature.indexOf("$") != -1)
                  {
                      continue;
                  }                    
                  
                  if (signature.endsWith("[]"))
                  {
                      signature = signature.substring(0, signature.length()-2);
                  }                   
                  
                  classReferences.put(signature,signature);
              }
  
              if (constantPoolArray[i] instanceof ConstantCP)
              {
                  index = ((ConstantCP)
                      constantPoolArray[i]).getNameAndTypeIndex();
                  
                  ConstantNameAndType ntConstant = (ConstantNameAndType)
                      constantPool.getConstant(index);
                  
                  index = ntConstant.getSignatureIndex();
  
                  ConstantUtf8 constant = (ConstantUtf8) 
                      constantPool.getConstant(index);
  
                  signature = new String(constant.getBytes());
                  String returnType = Utility.methodSignatureReturnType(signature);
                  if (returnType.indexOf(".") != -1)
                  {
                      if (returnType.endsWith("[]"))
                      {
                          returnType = returnType.substring(0, returnType.length()-2);
                      }                   
                      
                      if (returnType.indexOf("$") == -1)
                      {
                          classReferences.put(returnType,returnType);
                      }                        
                  }                    
  
                  if (constantPoolArray[i] instanceof ConstantMethodref ||
                      constantPoolArray[i] instanceof ConstantInterfaceMethodref)
                  {
                      String[] argumentTypes = Utility.methodSignatureArgumentTypes(signature);
                  
                      for (int j = 0; j < argumentTypes.length; j++)
                      {
                          String argType = argumentTypes[j];
                          if (argType.indexOf(".") != -1)
                          {
                              if (argType.endsWith("[]"))
                              {
                                  argType = argType.substring(0, argType.length()-2);
                              }                   
                              if (argType.indexOf("$") == -1)
                              {
                                  classReferences.put(argType,argType);
                              }                                
                          }                    
                      }
                  }
              }
          }
      
          return classReferences;
      }
      
      /**
       * Find all the local variable references within a method.
       *
       * @param String name of java class
       * @return Hashtable
       */
      public static Hashtable localVariables(String name) throws Exception
      {
          Hashtable vars = new Hashtable();
          
          JavaClass javaClass;
          
          if ((javaClass = Repository.lookupClass(name)) == null)
          {
              javaClass = new ClassParser(name).parse();
          }            
          
          Method[] methods = javaClass.getMethods();
          
          for (int i = 0; i < methods.length; i++)
          {
              Code code = methods[i].getCode();
              if (code != null)
              {
                  LocalVariableTable table = code.getLocalVariableTable();
                  
                  if (table == null)
                  {
                      continue;
                  }                    
                  
                  LocalVariable[] lvt = table.getLocalVariableTable();
                  
                  for (int j = 0; j < lvt.length; j++)
                  {
                      String lvar = Utility.signatureToString(lvt[j].getSignature());
                      
                      if (lvar.indexOf(".") == -1)
                      {
                          continue;
                      }                        
                      
                      if (lvar.indexOf("$") != -1)
                      {
                          continue;
                      }                        
                      
                      /*
                       * Get rid of the array signature
                       * if present we just need the base type
                       * signature.
                       */
                      if (lvar.endsWith("[]"))
                      {
                          lvar = lvar.substring(0, lvar.length() - 2);
                      }                        
                          
                      vars.put(lvar,lvar);
                      
                      /* 
                       * Process the constant pool of the method.
                       */
                      Hashtable methodClassReferences = 
                          processConstantPool(code.getConstantPool());
                          
                      vars.putAll(methodClassReferences);
                  }                    
              }                
          }
      
          return vars;
      }
  
      public static void main(String[] args)
      {
          ImportStatements is = new ImportStatements(args[0]);
      }
  }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Thu Jun 21 14:27:50 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 35459 invoked by uid 500); 21 Jun 2001 14:27:14 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 35312 invoked by uid 500); 21 Jun 2001 14:26:53 -0000
Delivered-To: carrricky@example.org
Date: 21 Jun 2001 14:26:42 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/share/sample/build build.xml

jvanzyl     01/06/21 07:26:42

  Modified:    src/share/sample/build build.xml
  Log:
  - adding check for windows ME
  
  Revision  Changes    Path
  1.9       +4 -1      jakarta-turbine-tdk/src/share/sample/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample/build/build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.xml	2001/06/16 15:49:48	1.8
  +++ build.xml	2001/06/21 14:26:38	1.9
  @@ -530,7 +530,10 @@
     <target name="set-windowsNT" depends="set-windows2000" if="isWindows NT">
       <property name="is.Windows" value="true" />
     </target>
  -  <target name="set-windows2000" if="isWindows 2000">
  +  <target name="set-windows2000" depends="set-windowsME" if="isWindows 2000">
  +    <property name="is.Windows" value="true" />
  +  </target>
  +  <target name="set-windowsME" if="isWindows Me">
       <property name="is.Windows" value="true" />
     </target>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Fri Jun 22 15:07:54 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 87469 invoked by uid 500); 22 Jun 2001 15:07:49 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 87445 invoked by uid 500); 22 Jun 2001 15:07:45 -0000
Delivered-To: carrricky@example.org
Date: 22 Jun 2001 15:07:45 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/share/sample/build GETTING_STARTED.txt

jvanzyl     01/06/22 08:07:44

  Modified:    src/share/sample/build GETTING_STARTED.txt
  Log:
  - trying to clarify the GETTING_STARTED guide
  - correcting misnamed file
  
  Revision  Changes    Path
  1.4       +4 -4      jakarta-turbine-tdk/src/share/sample/build/GETTING_STARTED.txt
  
  Index: GETTING_STARTED.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample/build/GETTING_STARTED.txt,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- GETTING_STARTED.txt	2001/06/16 15:49:48	1.3
  +++ GETTING_STARTED.txt	2001/06/22 15:07:43	1.4
  @@ -5,12 +5,9 @@
   Hey! You made it!
   
   To get the sample peer application running you must edit
  -a few properties in your ./project/newapp.properties file
  +a few properties in your build.properties file
   and run the "init" target in the provided Ant build file.
   
  -YOU MUST RUN THE INITIALIZATION TARGET OR NOTHING
  -WILL WORK!!! YOU HAVE BEEN WARNED!!
  -
   You must edit the following properties in your
   build.properties file:
   
  @@ -27,6 +24,9 @@
   initialization target of your build file:
   
       ant init 
  +
  +YOU MUST RUN THE INITIALIZATION TARGET OR NOTHING
  +WILL WORK!!! YOU HAVE BEEN WARNED!!
   
   You must have an installed version of Ant, if you
   do not have an installed version of Ant you can
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Fri Jun 22 15:20:39 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 5609 invoked by uid 500); 22 Jun 2001 15:20:31 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 5577 invoked by uid 500); 22 Jun 2001 15:20:29 -0000
Delivered-To: carrricky@example.org
Date: 22 Jun 2001 15:20:27 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/share/sample/build build.xml

jvanzyl     01/06/22 08:20:27

  Modified:    src/share/sample/build build.xml
  Log:
  - updating props before project targets. the source formatting
    is killing the jvm. quick fix.
  
  Revision  Changes    Path
  1.10      +3 -3      jakarta-turbine-tdk/src/share/sample/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample/build/build.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.xml	2001/06/21 14:26:38	1.9
  +++ build.xml	2001/06/22 15:20:26	1.10
  @@ -80,10 +80,10 @@
       <antcall target="turbine-id-table-init-sql"/>
       <antcall target="turbine-security-sql"/>
       <antcall target="turbine-insert-sql"/>
  -    
  -    <antcall target="project"/>
  -    
  +
       <antcall target="update-tr-props"/>
  +
  +    <antcall target="project"/>
       
     </target>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Thu Jun 28 12:49:43 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 42490 invoked by uid 500); 28 Jun 2001 12:49:24 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Delivered-To: moderator for carrricky@example.org
Received: (qmail 31586 invoked by uid 500); 28 Jun 2001 10:16:54 -0000
Delivered-To: carrricky@example.org
Date: 28 Jun 2001 10:16:52 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src build.xml

mpoeschl    01/06/28 03:16:52

  Modified:    src      build.xml
  Log:
  extend filter for app build.xml (TARGET_DIRECTORY)
  
  Revision  Changes    Path
  1.13      +1 -0      jakarta-turbine-tdk/src/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml	2001/06/08 17:08:53	1.12
  +++ build.xml	2001/06/28 10:16:49	1.13
  @@ -219,6 +219,7 @@
       <filter token="OUTPUT_DIRECTORY" value="${output.directory}"/>
       <filter token="SCHEMA_DIRECTORY" value="${schema.directory}"/>
       <filter token="TARGET_PACKAGE" value="${target.package}"/>
  +    <filter token="TARGET_DIRECTORY" value="${target.directory}"/>
   
       <copy todir="${app.build}" filtering="yes">
         <fileset dir="${app.root.build}"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Thu Jun 28 12:53:46 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 50454 invoked by uid 500); 28 Jun 2001 12:53:38 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 50206 invoked by uid 500); 28 Jun 2001 12:53:34 -0000
Delivered-To: carrricky@example.org
Date: 28 Jun 2001 12:53:29 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/share/sample/src/java/modules/screens ServletInfo.java

jvanzyl     01/06/28 05:53:29

  Modified:    src      build.xml
               src/share/sample/conf project-schema.xml
               src/share/sample/src/java/modules/actions Upload.java
               src/share/sample/src/java/modules/screens ServletInfo.java
  Removed:     src/share/sample/conf project-inputs.xml
  Log:
  - updating cvs with changes i have made over the last week or so.
  
  Revision  Changes    Path
  1.14      +3 -2      jakarta-turbine-tdk/src/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/build.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.xml	2001/06/28 10:16:49	1.13
  +++ build.xml	2001/06/28 12:53:14	1.14
  @@ -247,8 +247,8 @@
       />
   
       <move 
  -      file="${app.conf}/project-inputs.xml"
  -      tofile="${app.conf}/${turbine.app}-inputs.xml"
  +      file="${app.conf}/project-intake.xml"
  +      tofile="${app.conf}/${turbine.app}-intake.xml"
       />
     </target>
   
  @@ -327,6 +327,7 @@
         <property name="module.packages" value="${target.package}.modules,${flux.modules}"/>
         <property name="include.file" value="include = Flux.properties"/>
         <property name="template.path" value="/templates/app,/templates/flux"/>
  +      <property name="intake.descriptor" value="WEB-INF/conf/${turbine.app}-intake.xml"/>
       </ant>
   
     </target>
  
  
  
  1.3       +2 -2      jakarta-turbine-tdk/src/share/sample/conf/project-schema.xml
  
  Index: project-schema.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample/conf/project-schema.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project-schema.xml	2001/06/08 17:08:55	1.2
  +++ project-schema.xml	2001/06/28 12:53:19	1.3
  @@ -8,9 +8,9 @@
   
   <app-data>
   
  -<database name="@PROJECT@" defaultIdMethod="idBroker">
  +<database>
     
  -  <table name="RDF">
  +  <table name="RDF" idMethod="idbroker">
       <column name="RDF_ID" required="true" primaryKey="true" type="INTEGER"/>
       <column name="TITLE" size="255" type="VARCHAR"/>
       <column name="BODY" size="255" type="VARCHAR"/>
  
  
  
  1.2       +5 -3      jakarta-turbine-tdk/src/share/sample/src/java/modules/actions/Upload.java
  
  Index: Upload.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample/src/java/modules/actions/Upload.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Upload.java	2001/05/27 22:35:33	1.1
  +++ Upload.java	2001/06/28 12:53:23	1.2
  @@ -59,8 +59,10 @@
   import org.apache.velocity.context.Context;
   
   import org.apache.turbine.util.RunData;
  -import org.apache.turbine.util.upload.FileItem;
  -import org.apache.turbine.services.servlet.TurbineServlet;
  +//import org.apache.turbine.util.upload.FileItem;
  +import org.apache.turbine.services.upload.FileItem;
  +//import org.apache.turbine.services.servlet.TurbineServlet;
  +import org.apache.turbine.Turbine;
   
   /**
    * Class responsible for performing the company admin actions
  @@ -77,7 +79,7 @@
           throws Exception
       {
           FileItem fileItem = data.getParameters().getFileItem("file");
  -        fileItem.write(TurbineServlet.getRealPath("/uploaded.file"));
  +        fileItem.write(Turbine.getRealPath("/uploaded.file"));
       }
   
       /**
  
  
  
  1.2       +2 -2      jakarta-turbine-tdk/src/share/sample/src/java/modules/screens/ServletInfo.java
  
  Index: ServletInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample/src/java/modules/screens/ServletInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServletInfo.java	2001/05/31 22:01:43	1.1
  +++ ServletInfo.java	2001/06/28 12:53:26	1.2
  @@ -54,8 +54,8 @@
    * <http://www.apache.org/>.
    */
   
  +import org.apache.turbine.Turbine;
   import org.apache.turbine.util.RunData;
  -import org.apache.turbine.services.servlet.TurbineServlet;
   import org.apache.velocity.context.Context;
   
   /**
  @@ -73,6 +73,6 @@
        */
       public void doBuildTemplate( RunData data, Context context )
       {
  -        context.put("serverName", TurbineServlet.getServerName());
  +        context.put("serverName", Turbine.getServerName());
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org


From turbine-tdk-dev-returncarrricky@example.org Thu Jun 28 17:45:27 2001
Return-Path: <turbine-tdk-dev-returncarrricky@example.org>
Delivered-To: carrricky@example.org
Received: (qmail 6923 invoked by uid 500); 28 Jun 2001 17:45:24 -0000
Mailing-List: contact carrricky@example.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:carrricky@example.org>
List-Help: <mailto:carrricky@example.org>
List-Unsubscribe: <mailto:carrricky@example.org>
List-Subscribe: <mailto:carrricky@example.org>
Delivered-To: mailing list carrricky@example.org
Received: (qmail 6867 invoked by uid 500); 28 Jun 2001 17:45:23 -0000
Delivered-To: carrricky@example.org
Date: 28 Jun 2001 17:45:23 -0000
Message-ID: <carrricky@example.org>
From: carrricky@example.org
To: carrricky@example.org
Subject: cvs commit: jakarta-turbine-tdk/src/share/sample/templates/app/screens VelocityError.vm Error.vm

jvanzyl     01/06/28 10:45:23

  Added:       src/share/sample/templates/app/screens VelocityError.vm
  Removed:     src/share/sample/templates/app/screens Error.vm
  Log:
  - renaming the error template to match a standard velocity error
    screen.
  
  Revision  Changes    Path
  1.1                  jakarta-turbine-tdk/src/share/sample/templates/app/screens/VelocityError.vm
  
  Index: VelocityError.vm
  ===================================================================
  $page.setTitle("Error")
  
  $page.setBgColor("#ffffff")
  
  <font face="verdana,geneva,helvetica">
  
  <h2>Error</h2>
  
  $processingException
  
  <hr>
  
  $stackTrace
  
  </font>
  
  <br>
  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: carrricky@example.org
For additional commands, e-mail: carrricky@example.org



{'source': 'Apache Software Foundation Public Mail Archives'}