tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r573083 - in /incubator/tuscany/java/das: distribution/binary/ distribution/binary/src/main/assembly/ distribution/source/src/main/assembly/ samples/ samples/advanced-webapp/ samples/company-webapp/ samples/companyweb/ samples/customer/ sam...
Date Wed, 05 Sep 2007 22:04:42 GMT
Author: lresende
Date: Wed Sep  5 15:04:36 2007
New Revision: 573083

URL: http://svn.apache.org/viewvc?rev=573083&view=rev
Log:
Renaming webapp samples

Added:
    incubator/tuscany/java/das/samples/advanced-webapp/
      - copied from r573010, incubator/tuscany/java/das/samples/sample-ajax-das/
    incubator/tuscany/java/das/samples/company-webapp/
      - copied from r573010, incubator/tuscany/java/das/samples/companyweb/
    incubator/tuscany/java/das/samples/testing/tomcat/advanced-webapp/
      - copied from r573010, incubator/tuscany/java/das/samples/testing/tomcat/sample-ajax-das/
    incubator/tuscany/java/das/samples/testing/tomcat/company-webapp/
      - copied from r573010, incubator/tuscany/java/das/samples/testing/tomcat/companyweb/
Removed:
    incubator/tuscany/java/das/samples/companyweb/
    incubator/tuscany/java/das/samples/sample-ajax-das/
    incubator/tuscany/java/das/samples/testing/tomcat/companyweb/
    incubator/tuscany/java/das/samples/testing/tomcat/sample-ajax-das/
Modified:
    incubator/tuscany/java/das/distribution/binary/pom.xml
    incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml
    incubator/tuscany/java/das/distribution/source/src/main/assembly/src.xml
    incubator/tuscany/java/das/samples/advanced-webapp/pom.xml
    incubator/tuscany/java/das/samples/company-webapp/pom.xml
    incubator/tuscany/java/das/samples/customer/pom.xml
    incubator/tuscany/java/das/samples/pom.xml
    incubator/tuscany/java/das/samples/testing/tomcat/advanced-webapp/pom.xml
    incubator/tuscany/java/das/samples/testing/tomcat/advanced-webapp/src/test/java/org/apache/tuscany/test/das/AjaxDasTestCase.java
    incubator/tuscany/java/das/samples/testing/tomcat/build.xml
    incubator/tuscany/java/das/samples/testing/tomcat/company-webapp/pom.xml
    incubator/tuscany/java/das/samples/testing/tomcat/company-webapp/src/test/java/org/apache/tuscany/test/das/DasTestCase.java
    incubator/tuscany/java/das/samples/testing/tomcat/pom.xml

Modified: incubator/tuscany/java/das/distribution/binary/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/distribution/binary/pom.xml?rev=573083&r1=573082&r2=573083&view=diff
==============================================================================
--- incubator/tuscany/java/das/distribution/binary/pom.xml (original)
+++ incubator/tuscany/java/das/distribution/binary/pom.xml Wed Sep  5 15:04:36 2007
@@ -40,20 +40,20 @@
 
        <dependency>
           <groupId>org.apache.tuscany.das.samples</groupId>
-          <artifactId>tuscany-das-sample-companyweb</artifactId>
+          <artifactId>tuscany-das-sample-company-webapp</artifactId>
           <version>${das.version}</version>
           <type>war</type>
       </dependency>        
 
        <dependency>
           <groupId>org.apache.tuscany.das.samples</groupId>
-          <artifactId>tuscany-das-sample-customer-j2se</artifactId>
+          <artifactId>tuscany-das-sample-customer</artifactId>
           <version>${das.version}</version>
       </dependency>        
 
        <dependency>
           <groupId>org.apache.tuscany.das.samples</groupId>
-          <artifactId>sample-ajax-das</artifactId>
+          <artifactId>tuscany-das-sample-advanced-webapp</artifactId>
           <version>${das.version}</version>
           <type>war</type>
       </dependency>        

Modified: incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml?rev=573083&r1=573082&r2=573083&view=diff
==============================================================================
--- incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml (original)
+++ incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml Wed Sep  5 15:04:36
2007
@@ -50,14 +50,14 @@
         <files>
             <!-- include readme for companyweb sample -->
             <file>
-               <source>../../samples/companyweb/readme.htm</source>
-               <outputDirectory>tuscany-das-${das.version}/samples/companyweb</outputDirectory>
+               <source>../../samples/company-webapp/readme.htm</source>
+               <outputDirectory>tuscany-das-${das.version}/samples/company-webapp</outputDirectory>
                <fileMode>0644</fileMode>
             </file>
             <!-- include companyweb sample -->
             <file>
-               <source>../../samples/companyweb/target/sample-companyweb.war</source>
-               <outputDirectory>tuscany-das-${das.version}/samples/companyweb</outputDirectory>
+               <source>../../samples/company-webapp/target/sample-company-webapp.war</source>
+               <outputDirectory>tuscany-das-${das.version}/samples/company-webapp</outputDirectory>
                <fileMode>0644</fileMode>
             </file>
 
@@ -65,14 +65,14 @@
             
             <!-- include readme for ajax das sample -->
             <file>
-               <source>../../samples/sample-ajax-das/readme.htm</source>
-               <outputDirectory>tuscany-das-${das.version}/samples/sample-ajax-das</outputDirectory>
+               <source>../../samples/advanced-webapp/readme.htm</source>
+               <outputDirectory>tuscany-das-${das.version}/samples/advanced-webapp</outputDirectory>
                <fileMode>0644</fileMode>
             </file>
             <!-- include ajax das sample -->
             <file>
-               <source>../../samples/sample-ajax-das/target/sample-ajax-das.war</source>
-               <outputDirectory>tuscany-das-${das.version}/samples/sample-ajax-das</outputDirectory>
+               <source>../../samples/advanced-webapp/target/sample-advanced-webapp.war</source>
+               <outputDirectory>tuscany-das-${das.version}/samples/advanced-webapp</outputDirectory>
                <fileMode>0644</fileMode>
             </file>
             

Modified: incubator/tuscany/java/das/distribution/source/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/distribution/source/src/main/assembly/src.xml?rev=573083&r1=573082&r2=573083&view=diff
==============================================================================
--- incubator/tuscany/java/das/distribution/source/src/main/assembly/src.xml (original)
+++ incubator/tuscany/java/das/distribution/source/src/main/assembly/src.xml Wed Sep  5 15:04:36
2007
@@ -48,9 +48,13 @@
          <include>**/*.*</include>
       </includes>
       <excludes>
+         <exclude>**/ldap/**</exclude>
          <exclude>**/target/**</exclude>
+         <exclude>**/.settings/**</exclude>
          <exclude>**/**.mdl</exclude>
          <exclude>**/derby.log</exclude>
+         <exclude>**/.project</exclude>
+         <exclude>**/.classpath</exclude>
       </excludes>
       <fileMode>0644</fileMode>
     </fileSet>

Modified: incubator/tuscany/java/das/samples/advanced-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/advanced-webapp/pom.xml?rev=573083&r1=573010&r2=573083&view=diff
==============================================================================
--- incubator/tuscany/java/das/samples/advanced-webapp/pom.xml (original)
+++ incubator/tuscany/java/das/samples/advanced-webapp/pom.xml Wed Sep  5 15:04:36 2007
@@ -23,10 +23,10 @@
     </parent>
 	
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>sample-ajax-das</artifactId>
+    <artifactId>tuscany-das-sample-advanced-webapp</artifactId>
     <packaging>war</packaging>
-    <name>Tuscany DAS Ajax Sample</name>
-    <description>Sample demo of RDB DAS features in a Web application using Ajax</description>
+    <name>Tuscany DAS Advanced Sample</name>
+    <description>Advanced DAS web applicaiton Sample based on Ajax</description>
 
     <dependencies>
 		
@@ -80,7 +80,7 @@
     
     <!-- this will place the java source files inside the war -->
         <build>
-            <finalName>sample-ajax-das</finalName>
+            <finalName>sample-advanced-webapp</finalName>
             <sourceDirectory>src/main/java</sourceDirectory>
             <resources>
                 <resource>

Modified: incubator/tuscany/java/das/samples/company-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/company-webapp/pom.xml?rev=573083&r1=573010&r2=573083&view=diff
==============================================================================
--- incubator/tuscany/java/das/samples/company-webapp/pom.xml (original)
+++ incubator/tuscany/java/das/samples/company-webapp/pom.xml Wed Sep  5 15:04:36 2007
@@ -25,7 +25,7 @@
         <version>1.0-incubating-SNAPSHOT</version>
     </parent>
 
-    <artifactId>tuscany-das-sample-companyweb</artifactId>
+    <artifactId>tuscany-das-sample-company-webapp</artifactId>
     <packaging>war</packaging>
     <name>Tuscany DAS Company Sample</name>
     <description>Sample use of RDB DAS in a Web application</description>
@@ -61,7 +61,7 @@
 
     <!-- this will place the java source files inside the war -->
     <build>
-        <finalName>sample-companyweb</finalName>
+        <finalName>sample-company-webapp</finalName>
         <sourceDirectory>src/main/java</sourceDirectory>
         <resources>
             <resource>

Modified: incubator/tuscany/java/das/samples/customer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/customer/pom.xml?rev=573083&r1=573082&r2=573083&view=diff
==============================================================================
--- incubator/tuscany/java/das/samples/customer/pom.xml (original)
+++ incubator/tuscany/java/das/samples/customer/pom.xml Wed Sep  5 15:04:36 2007
@@ -25,9 +25,9 @@
         <version>1.0-incubating-SNAPSHOT</version>
     </parent>
 
-    <artifactId>tuscany-das-sample-customer-j2se</artifactId>
+    <artifactId>tuscany-das-sample-customer</artifactId>
     <packaging>jar</packaging>
-    <name>Tuscany DAS J2SE Customer Sample</name>
+    <name>Tuscany DAS Customer Sample</name>
     <description>Sample use of RDB DAS in a J2SE application</description>
 
     <dependencies>

Modified: incubator/tuscany/java/das/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/pom.xml?rev=573083&r1=573082&r2=573083&view=diff
==============================================================================
--- incubator/tuscany/java/das/samples/pom.xml (original)
+++ incubator/tuscany/java/das/samples/pom.xml Wed Sep  5 15:04:36 2007
@@ -32,8 +32,8 @@
 
     <modules>
         <module>dbconfig</module>
-        <module>companyweb</module>
-        <module>sample-ajax-das</module>
+        <module>company-webapp</module>
+        <module>advanced-webapp</module>
         <module>customer</module>
     </modules>
 </project>

Modified: incubator/tuscany/java/das/samples/testing/tomcat/advanced-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/testing/tomcat/advanced-webapp/pom.xml?rev=573083&r1=573010&r2=573083&view=diff
==============================================================================
--- incubator/tuscany/java/das/samples/testing/tomcat/advanced-webapp/pom.xml (original)
+++ incubator/tuscany/java/das/samples/testing/tomcat/advanced-webapp/pom.xml Wed Sep  5 15:04:36
2007
@@ -25,7 +25,7 @@
         <version>1.0-incubating-SNAPSHOT</version>
     </parent>
 
-    <artifactId>tuscany-das-samples-testing-tomcatsampleajaxdas</artifactId>
+    <artifactId>tuscany-das-samples-testing-tomcat-advanced-webapp</artifactId>
     <packaging>jar</packaging>
     <name>Tuscany Testing Ajax DAS Web Sample</name>
     <description>Testing Tomcat Ajax DAS end user test</description>

Modified: incubator/tuscany/java/das/samples/testing/tomcat/advanced-webapp/src/test/java/org/apache/tuscany/test/das/AjaxDasTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/testing/tomcat/advanced-webapp/src/test/java/org/apache/tuscany/test/das/AjaxDasTestCase.java?rev=573083&r1=573010&r2=573083&view=diff
==============================================================================
--- incubator/tuscany/java/das/samples/testing/tomcat/advanced-webapp/src/test/java/org/apache/tuscany/test/das/AjaxDasTestCase.java
(original)
+++ incubator/tuscany/java/das/samples/testing/tomcat/advanced-webapp/src/test/java/org/apache/tuscany/test/das/AjaxDasTestCase.java
Wed Sep  5 15:04:36 2007
@@ -38,7 +38,7 @@
 import com.gargoylesoftware.htmlunit.html.HtmlSelect;
 
 public class AjaxDasTestCase extends TestCase {
-    public static final String testUrl = "http://localhost:8080/sample-ajax-das";
+    public static final String testUrl = "http://localhost:8080/sample-advanced-webapp";
 
     protected WebClient _webClient;
     protected URL _url;

Modified: incubator/tuscany/java/das/samples/testing/tomcat/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/testing/tomcat/build.xml?rev=573083&r1=573082&r2=573083&view=diff
==============================================================================
--- incubator/tuscany/java/das/samples/testing/tomcat/build.xml (original)
+++ incubator/tuscany/java/das/samples/testing/tomcat/build.xml Wed Sep  5 15:04:36 2007
@@ -59,8 +59,8 @@
         <property name="tuscany.sdo.acceptance.version" value='incubating-M1' />
 
 <!--KJW  Define location of canned Derby database -->
-        <property name="tuscany.acceptance.das.samples.companyweb.dir" value='../../companyweb'
/>
-        <property name="tuscany.acceptance.das.samples.sampleajaxdas.dir" value='../../sample-ajax-das'
/>
+        <property name="tuscany.acceptance.das.samples.companyweb.dir" value='../../company-webapp'
/>
+        <property name="tuscany.acceptance.das.samples.advancedweb.dir" value='../../advanced-webapp'
/>
 
         <property name="tuscany.maven.repos.dir" value='${user.home}\.m2\repository' />
         <condition property="isWindows">
@@ -151,7 +151,7 @@
                         <fileset dir="${tuscany.maven.repos.dir}">
                                 <patternset refid="tuscany.acceptance.tc.specsdoimpl"
/>
                         </fileset>
-                        <fileset dir="${tuscany.acceptance.das.samples.sampleajaxdas.dir}">
+                        <fileset dir="${tuscany.acceptance.das.samples.advancedweb.dir}">
                                 <include name="**/*.war" />
                         </fileset>                        
                         <fileset dir="${tuscany.maven.repos.dir}">
@@ -172,7 +172,7 @@
                         <fileset dir="${tuscany.acceptance.das.samples.companyweb.dir}">
                                 <include name="**/*.war" />
                         </fileset>
-                        <fileset dir="${tuscany.acceptance.das.samples.sampleajaxdas.dir}">
+                        <fileset dir="${tuscany.acceptance.das.samples.advancedweb.dir}">
                                 <include name="**/*.war" />
                         </fileset>                         
                         <!-- lresende - using the right name on the build now, don't need
to clean up -->
@@ -192,7 +192,7 @@
                         <fileset dir="${tuscany.acceptance.das.samples.companyweb.dir}">
                                 <include name="**/dastest/**" />
                         </fileset>
-                        <fileset dir="${tuscany.acceptance.das.samples.sampleajaxdas.dir}">
+                        <fileset dir="${tuscany.acceptance.das.samples.advancedweb.dir}">
                                 <include name="**/ajaxdastest/**" />
                         </fileset>
                 </copy -->

Modified: incubator/tuscany/java/das/samples/testing/tomcat/company-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/testing/tomcat/company-webapp/pom.xml?rev=573083&r1=573010&r2=573083&view=diff
==============================================================================
--- incubator/tuscany/java/das/samples/testing/tomcat/company-webapp/pom.xml (original)
+++ incubator/tuscany/java/das/samples/testing/tomcat/company-webapp/pom.xml Wed Sep  5 15:04:36
2007
@@ -25,9 +25,9 @@
         <version>1.0-incubating-SNAPSHOT</version>
     </parent>
 
-    <artifactId>tuscany-das-samples-testing-tomcatcompanyweb</artifactId>
+    <artifactId>tuscany-das-samples-testing-tomcat-company-webapp</artifactId>
     <packaging>jar</packaging>
-    <name>Tuscany Testing DAS Sample - Companyweb</name>
+    <name>Tuscany Testing DAS Sample - Company-webapp</name>
     <description>Testing Tomcat DAS end user test</description>
 
 

Modified: incubator/tuscany/java/das/samples/testing/tomcat/company-webapp/src/test/java/org/apache/tuscany/test/das/DasTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/testing/tomcat/company-webapp/src/test/java/org/apache/tuscany/test/das/DasTestCase.java?rev=573083&r1=573010&r2=573083&view=diff
==============================================================================
--- incubator/tuscany/java/das/samples/testing/tomcat/company-webapp/src/test/java/org/apache/tuscany/test/das/DasTestCase.java
(original)
+++ incubator/tuscany/java/das/samples/testing/tomcat/company-webapp/src/test/java/org/apache/tuscany/test/das/DasTestCase.java
Wed Sep  5 15:04:36 2007
@@ -28,7 +28,7 @@
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
 
 public class DasTestCase extends TestCase {
-    public static final String testUrl = "http://localhost:8080/sample-companyweb/";
+    public static final String testUrl = "http://localhost:8080/sample-company-webapp/";
 
     protected WebClient _webClient;
     protected URL _url;

Modified: incubator/tuscany/java/das/samples/testing/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/testing/tomcat/pom.xml?rev=573083&r1=573082&r2=573083&view=diff
==============================================================================
--- incubator/tuscany/java/das/samples/testing/tomcat/pom.xml (original)
+++ incubator/tuscany/java/das/samples/testing/tomcat/pom.xml Wed Sep  5 15:04:36 2007
@@ -30,8 +30,8 @@
     <name>Tuscany Testing in Tomcat</name>
 
     <modules>
-        <module>companyweb</module>
-        <module>sample-ajax-das</module>        
+        <module>company-webapp</module>
+        <module>advanced-webapp</module>        
     </modules>
 
     <build>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message