[wsas-java-dev] svn commit r1928 - in trunk/wsas/java: .
modules/admin modules/admin/src/org/wso2/wsas/admin
modules/samples modules/samples/CommodityQuote
modules/samples/CommodityQuote/conf modules/samples/FlickrClient
modules/samples/FlickrClient/conf
modules/samples/FlickrClient/generated modules/samples/Trader
modules/samples/Trader/conf modules/samples/conf
svn at wso2.org
svn at wso2.org
Fri Apr 20 23:17:47 PDT 2007
Author: saminda
Date: Fri Apr 20 23:16:59 2007
New Revision: 1928
Added:
trunk/wsas/java/modules/samples/CommodityQuote/conf/codegen.xml
trunk/wsas/java/modules/samples/FlickrClient/conf/codegen.xml
trunk/wsas/java/modules/samples/Trader/conf/codegen.xml
Removed:
trunk/wsas/java/modules/samples/FlickrClient/generated/
trunk/wsas/java/modules/samples/conf/
Modified:
trunk/wsas/java/modules/admin/pom.xml
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/wsas-admin-codegen.xml
trunk/wsas/java/modules/samples/CommodityQuote/pom.xml
trunk/wsas/java/modules/samples/FlickrClient/pom.xml
trunk/wsas/java/modules/samples/Trader/pom.xml
trunk/wsas/java/modules/samples/pom.xml
trunk/wsas/java/pom.xml
Log:
1. Moved all generated code to "target/generate" directory
2. Removed -Dcgs profile.
Modified: trunk/wsas/java/modules/admin/pom.xml
==============================================================================
--- trunk/wsas/java/modules/admin/pom.xml (original)
+++ trunk/wsas/java/modules/admin/pom.xml Fri Apr 20 23:16:59 2007
@@ -239,7 +239,7 @@
</goals>
<configuration>
<sources>
- <source>${basedir}/generated/src</source>
+ <source>${basedir}/target/generated/src</source>
</sources>
</configuration>
</execution>
@@ -251,7 +251,7 @@
</goals>
<configuration>
<sources>
- <source>${basedir}/generated-test/src</source>
+ <source>${basedir}/target/generated-test/src</source>
</sources>
</configuration>
</execution>
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/wsas-admin-codegen.xml
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/wsas-admin-codegen.xml (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/wsas-admin-codegen.xml Fri Apr 20 23:16:59 2007
@@ -20,7 +20,7 @@
<set>
<uri>./src/org/wso2/wsas/admin/service/META-INF/LoggingService.wsdl</uri>
- <o>./generated-test</o>
+ <o>./target/generated-test</o>
<p>org.wso2.wsas.admin.service.logging</p>
<d>adb</d>
<s/>
@@ -29,7 +29,7 @@
<!-- Creating Skeletons -->
<set>
<uri>./src/org/wso2/wsas/admin/service/META-INF/LoggingService.wsdl</uri>
- <o>./generated</o>
+ <o>./target/generated</o>
<p>org.wso2.wsas.admin.service.logging</p>
<d>adb</d>
<ss/>
Added: trunk/wsas/java/modules/samples/CommodityQuote/conf/codegen.xml
==============================================================================
--- (empty file)
+++ trunk/wsas/java/modules/samples/CommodityQuote/conf/codegen.xml Fri Apr 20 23:16:59 2007
@@ -0,0 +1,24 @@
+<config>
+ <!-- CommodityQuote Sample-->
+ <set>
+ <uri>./wsdl/CommodityQuote.wsdl</uri>
+ <o>./target/generated</o>
+ <p>org.wso2.wsas.sample.commodityquote.client</p>
+ <d>adb</d>
+ <u/>
+ <ns2p>http://www.wso2.org/types=org.wso2.www.types.client</ns2p>
+ <Emp>org.wso2.wsas.sample.commodityquote.mapper.client</Emp>
+ </set>
+
+ <set>
+ <uri>./wsdl/CommodityQuote.wsdl</uri>
+ <o>./target/generated</o>
+ <p>org.wso2.wsas.sample.commodityquote.services</p>
+ <d>adb</d>
+ <ss/>
+ <ssi/>
+ <u/>
+ <ns2p>http://www.wso2.org/types=org.wso2.www.types.services</ns2p>
+ <Emp>org.wso2.wsas.sample.commodityquote.mapper.services</Emp>
+ </set>
+</config>
\ No newline at end of file
Modified: trunk/wsas/java/modules/samples/CommodityQuote/pom.xml
==============================================================================
--- trunk/wsas/java/modules/samples/CommodityQuote/pom.xml (original)
+++ trunk/wsas/java/modules/samples/CommodityQuote/pom.xml Fri Apr 20 23:16:59 2007
@@ -27,6 +27,32 @@
</plugin>
<plugin>
+ <inherited>false</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-code</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <java classname="org.wso2.utils.codegen.CodegenHelper"
+ fork="true">
+ <arg value="./conf/codegen.xml"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath refid="maven.compile.classpath"/>
+ <classpath refid="maven.runtime.classpath"/>
+ </java>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.0</version>
@@ -39,15 +65,13 @@
</goals>
<configuration>
<sources>
- <source>${basedir}/generated/src</source>
+ <source>${basedir}/target/generated/src</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
-
</plugins>
-
</build>
</project>
Added: trunk/wsas/java/modules/samples/FlickrClient/conf/codegen.xml
==============================================================================
--- (empty file)
+++ trunk/wsas/java/modules/samples/FlickrClient/conf/codegen.xml Fri Apr 20 23:16:59 2007
@@ -0,0 +1,13 @@
+<config>
+ <!-- FlickrClient Sample-->
+ <set>
+ <uri>./wsdl/FlickrService.wsdl</uri>
+ <o>./target/generated</o>
+ <p>org.wso2.wsas.sample.flickr.client</p>
+ <d>adb</d>
+ <ns2p>http://wso2.org/repos/wso2/people/jonathan/flickr.wsdl=org.wso2.www.types.flickr.client</ns2p>
+ <u/>
+ <wv>2</wv>
+ </set>
+
+</config>
\ No newline at end of file
Modified: trunk/wsas/java/modules/samples/FlickrClient/pom.xml
==============================================================================
--- trunk/wsas/java/modules/samples/FlickrClient/pom.xml (original)
+++ trunk/wsas/java/modules/samples/FlickrClient/pom.xml Fri Apr 20 23:16:59 2007
@@ -25,6 +25,31 @@
<target>1.4</target>
</configuration>
</plugin>
+ <plugin>
+ <inherited>false</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-code</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <java classname="org.wso2.utils.codegen.CodegenHelper"
+ fork="true">
+ <arg value="./conf/codegen.xml"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath refid="maven.compile.classpath"/>
+ <classpath refid="maven.runtime.classpath"/>
+ </java>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -39,7 +64,7 @@
</goals>
<configuration>
<sources>
- <source>${basedir}/generated/src</source>
+ <source>${basedir}/target/generated/src</source>
</sources>
</configuration>
</execution>
Added: trunk/wsas/java/modules/samples/Trader/conf/codegen.xml
==============================================================================
--- (empty file)
+++ trunk/wsas/java/modules/samples/Trader/conf/codegen.xml Fri Apr 20 23:16:59 2007
@@ -0,0 +1,90 @@
+<config>
+ <!-- Trader Sample-->
+ <set>
+ <uri>./wsdl/Trader_Client.wsdl</uri>
+ <o>./target/generated</o>
+ <p>org.wso2.wsas.sample.trader.client</p>
+ <d>adb</d>
+ <ns2p>http://www.wso2.org/types=org.wso2.www.types.trader.client</ns2p>
+ <u/>
+ <Emp>org.wso2.www.types.trader.client.mapper</Emp>
+ </set>
+
+ <set>
+ <uri>./wsdl/Trader_Client.wsdl</uri>
+ <o>./target/generated</o>
+ <p>org.wso2.wsas.sample.trader.client</p>
+ <d>adb</d>
+ <ns2p>http://www.wso2.org/types=org.wso2.www.types.trader.client.service</ns2p>
+ <u/>
+ <ss/>
+ <ssi/>
+ <Emp>org.wso2.www.types.trader.client.mapper.service</Emp>
+ </set>
+
+ <set>
+ <uri>./wsdl/Exchange_Client.wsdl</uri>
+ <o>./target/generated</o>
+ <p>org.wso2.wsas.sample.exchange.client</p>
+ <d>adb</d>
+ <ns2p>http://www.wso2.org/types=org.wso2.www.types.exchange.client</ns2p>
+ <u/>
+ <Emp>org.wso2.www.types.exchange.client.mapper</Emp>
+ </set>
+
+ <set>
+ <uri>./wsdl/Exchange_Client.wsdl</uri>
+ <o>./target/generated</o>
+ <p>org.wso2.wsas.sample.exchange.client</p>
+ <d>adb</d>
+ <ns2p>http://www.wso2.org/types=org.wso2.www.types.exchange.client.service</ns2p>
+ <u/>
+ <ss/>
+ <ssi/>
+ <Emp>org.wso2.www.types.exchange.client.mapper.service</Emp>
+ </set>
+
+ <set>
+ <uri>./wsdl/Exchange_Trader.wsdl</uri>
+ <o>./target/generated</o>
+ <p>org.wso2.wsas.sample.exchange.trader</p>
+ <d>adb</d>
+ <ns2p>http://www.wso2.org/types=org.wso2.www.types.exchange.trader</ns2p>
+ <u/>
+ <Emp>org.wso2.www.types.exchange.trader.mapper</Emp>
+ </set>
+
+ <set>
+ <uri>./wsdl/Exchange_Trader.wsdl</uri>
+ <o>./target/generated</o>
+ <p>org.wso2.wsas.sample.exchange.trader</p>
+ <d>adb</d>
+ <ns2p>http://www.wso2.org/types=org.wso2.www.types.exchange.trader.service</ns2p>
+ <u/>
+ <ss/>
+ <ssi/>
+ <Emp>org.wso2.www.types.exchange.trader.mapper.service</Emp>
+ </set>
+
+ <set>
+ <uri>./wsdl/Trader_Exchange.wsdl</uri>
+ <o>./target/generated</o>
+ <p>org.wso2.wsas.sample.trader.exchange</p>
+ <d>adb</d>
+ <ns2p>http://www.wso2.org/types=org.wso2.www.types.trader.exchange</ns2p>
+ <u/>
+ <Emp>org.wso2.www.types.trader.exchange.mapper</Emp>
+ </set>
+
+ <set>
+ <uri>./wsdl/Trader_Exchange.wsdl</uri>
+ <o>./target/generated</o>
+ <p>org.wso2.wsas.sample.trader.exchange</p>
+ <d>adb</d>
+ <ns2p>http://www.wso2.org/types=org.wso2.www.types.trader.exchange.service</ns2p>
+ <u/>
+ <ss/>
+ <ssi/>
+ <Emp>org.wso2.www.types.trader.exchange.mapper.service</Emp>
+ </set>
+</config>
\ No newline at end of file
Modified: trunk/wsas/java/modules/samples/Trader/pom.xml
==============================================================================
--- trunk/wsas/java/modules/samples/Trader/pom.xml (original)
+++ trunk/wsas/java/modules/samples/Trader/pom.xml Fri Apr 20 23:16:59 2007
@@ -26,6 +26,31 @@
</configuration>
</plugin>
<plugin>
+ <inherited>false</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-code</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <java classname="org.wso2.utils.codegen.CodegenHelper"
+ fork="true">
+ <arg value="./conf/codegen.xml"/>
+ <classpath refid="maven.dependency.classpath"/>
+ <classpath refid="maven.compile.classpath"/>
+ <classpath refid="maven.runtime.classpath"/>
+ </java>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.0</version>
@@ -38,7 +63,7 @@
</goals>
<configuration>
<sources>
- <source>${basedir}/generated/src</source>
+ <source>${basedir}/target/generated/src</source>
</sources>
</configuration>
</execution>
Modified: trunk/wsas/java/modules/samples/pom.xml
==============================================================================
--- trunk/wsas/java/modules/samples/pom.xml (original)
+++ trunk/wsas/java/modules/samples/pom.xml Fri Apr 20 23:16:59 2007
@@ -29,48 +29,6 @@
<module>JavascriptService</module>
<module>TinyURL</module>
<module>Trader</module>
+ <!--<module>FlickrClient</module>-->
</modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
-
- <plugin>
- <inherited>false</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-code</id>
- <phase>initialize</phase>
- <configuration>
- <tasks>
- <echo>Generating skeletons for sample services</echo>
- <java classname="org.wso2.utils.codegen.CodegenHelper"
- fork="true">
- <arg value="./conf/wsas-samples-codegen.xml"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath refid="maven.compile.classpath"/>
- <classpath refid="maven.runtime.classpath"/>
- </java>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
-
-
</project>
Modified: trunk/wsas/java/pom.xml
==============================================================================
--- trunk/wsas/java/pom.xml (original)
+++ trunk/wsas/java/pom.xml Fri Apr 20 23:16:59 2007
@@ -265,6 +265,77 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.2</version>
</plugin>
+ <plugin>
+ <inherited>false</inherited>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>.</directory>
+ <includes>
+ <include>derby.log</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>modules/integration</directory>
+ <includes>
+ <include>**/*.jks</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+
+ <fileset>
+ <directory>modules/admin/logs</directory>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ <fileset>
+ <directory>modules/admin/test-resources/repository/modules</directory>
+ <includes>
+ <include>wso2throttle-${wso2throttle.version}.mar</include>
+ <include>addressing-${addressing.version}.mar</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ <fileset>
+ <directory>modules/core</directory>
+ <includes>
+ <include>conf/wso2wsas.jks</include>
+ <include>logs</include>
+ <include>derby.log</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ <fileset>
+ <directory>modules/standalone-edition</directory>
+ <includes>
+ <include>logs</include>
+ <include>conf/derby.log</include>
+ <include>conf/wso2wsas.jks</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ <fileset>
+ <directory>modules/distribution</directory>
+ <includes>
+ <include>derby.log</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ <fileset>
+ <directory>modules/integration</directory>
+ <includes>
+ <include>logs</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ <fileset>
+ <directory>modules/database</directory>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -1145,97 +1216,6 @@
</dependency>
</dependencies>
</profile>
-
- <profile>
- <id>clean-codegen-src</id>
- <activation>
- <property>
- <name>cgs</name>
- </property>
- </activation>
- <build>
- <plugins>
- <!-- Customize clean plugin for WSAS-->
- <plugin>
- <inherited>false</inherited>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <filesets>
- <fileset>
- <directory>.</directory>
- <includes>
- <include>derby.log</include>
- </includes>
- </fileset>
- <fileset>
- <directory>modules/integration</directory>
- <includes>
- <include>**/*.jks</include>
- </includes>
- <followSymlinks>false</followSymlinks>
- </fileset>
- <fileset>
- <directory>modules/clustering/generated</directory>
- <followSymlinks>false</followSymlinks>
- </fileset>
- <fileset>
- <directory>modules/samples/Trader/generated</directory>
- <followSymlinks>false</followSymlinks>
- </fileset>
- <fileset>
- <directory>modules/samples/CommodityQuote/generated</directory>
- <followSymlinks>false</followSymlinks>
- </fileset>
- <!--<fileset>
- <directory>modules/samples/FlickrClient/generated</directory>
- <followSymlinks>false</followSymlinks>
- </fileset>-->
- <fileset>
- <directory>modules/admin/logs</directory>
- <followSymlinks>false</followSymlinks>
- </fileset>
- <fileset>
- <directory>modules/admin/generated</directory>
- <followSymlinks>false</followSymlinks>
- </fileset>
- <fileset>
- <directory>modules/admin/generated-test</directory>
- <followSymlinks>false</followSymlinks>
- </fileset>
- <fileset>
- <directory>
- modules/admin/test-resources/repository/modules</directory>
- <includes>
- <include>wso2throttle-${wso2throttle.version}.mar</include>
- <include>addressing-${addressing.version}.mar</include>
- </includes>
- <followSymlinks>false</followSymlinks>
- </fileset>
- <fileset>
- <directory>modules/core</directory>
- <includes>
- <include>conf/wso2wsas.jks</include>
- <include>logs</include>
- <include>derby.log</include>
- </includes>
- <followSymlinks>false</followSymlinks>
- </fileset>
- <fileset>
- <directory>modules/standalone-edition</directory>
- <includes>
- <include>logs</include>
- <include>conf/derby.log</include>
- <include>conf/wso2wsas.jks</include>
- </includes>
- <followSymlinks>false</followSymlinks>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
<profile>
<id>macProfile</id>
<properties>
More information about the Wsas-java-dev
mailing list