You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/05/02 17:23:52 UTC
svn commit: r534512 - in /webservices/axis2/trunk/java:
modules/samples/maven.xml modules/samples/project.xml
modules/samples/version/pom.xml modules/webapp/conf/services.list
modules/webapp/pom.xml pom.xml
Author: dims
Date: Wed May 2 08:23:51 2007
New Revision: 534512
URL: http://svn.apache.org/viewvc?view=rev&rev=534512
Log:
add a pom for version service and add it to the war as well
Added:
webservices/axis2/trunk/java/modules/samples/version/pom.xml
Modified:
webservices/axis2/trunk/java/modules/samples/maven.xml
webservices/axis2/trunk/java/modules/samples/project.xml
webservices/axis2/trunk/java/modules/webapp/conf/services.list
webservices/axis2/trunk/java/modules/webapp/pom.xml
webservices/axis2/trunk/java/pom.xml
Modified: webservices/axis2/trunk/java/modules/samples/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/maven.xml?view=diff&rev=534512&r1=534511&r2=534512
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/maven.xml Wed May 2 08:23:51 2007
@@ -19,22 +19,10 @@
</preGoal>
<postGoal name="test:test">
- <!-- <j:if test="${context.getVariable('maven.test.skip') != 'true'}"> -->
<attainGoal name="create-samples"/>
- <!-- </j:if> -->
</postGoal>
- <goal name="mail-tests">
- <!-- TODO call the Mail tests if the mail jar is presents
- <j:if test="${maven.repo.local}/j2ee/jars/mail.jar">
- <ant:ant antfile="script/mail-test.xml" inheritall="true" inheritrefs="true" dir="."/>
- </j:if>
- maven -Dtestcase=org.foo.bar.MyTest test:single-test
- -->
- </goal>
-
<goal name="create-samples">
- <!-- <mkdir dir="target/samples"/>-->
<mkdir dir="${samples.dir}/userguide"/>
<mkdir dir="target/samples/wsdl"/>
<copy todir="target/samples/wsdl">
@@ -137,159 +125,4 @@
</jar>
</goal>
-
- <!-- ================================================================ -->
- <!--- Security Sample -->
- <!-- ================================================================ -->
- <goal name="securitySample">
-
- <mkdir dir="target/security"/>
- <mkdir dir="target/security/META-INF"/>
-
- <!-- Create the service archive -->
- <ant:move todir="target/security">
- <ant:fileset dir="target/classes">
- <ant:include name="sample/security/*.class"/>
- </ant:fileset>
- </ant:move>
- <ant:copy file="src/sample/security/META-INF/services.xml"
- tofile="target/security/META-INF/services.xml"/>
- <ant:copy file="resources/security/sec.jks" tofile="target/security/sec.jks"/>
- <ant:copy file="resources/security/sec.properties" tofile="target/security/sec.properties"/>
- <jar destfile="target/security/SecureService.aar">
- <fileset dir="target/security"></fileset>
- </jar>
-
- <!-- Create a jar to hold the password callback class-->
- <mkdir dir="target/security/secUtil/sample/security/"/>
- <ant:copy file="target/security/sample/security/PWCallback.class"
- toFile="target/security/secUtil/sample/security/PWCallback.class"/>
- <ant:copy file="target/security/sample/security/Client.class"
- toFile="target/security/secUtil/sample/security/Client.class"/>
- <ant:copy file="resources/security/sec.jks" tofile="target/security/secUtil/sec.jks"/>
- <ant:copy file="resources/security/sec.properties"
- tofile="target/security/secUtil/sec.properties"/>
- <jar destfile="target/security/secUtil.jar">
- <fileset dir="target/security/secUtil"></fileset>
- </jar>
-
- <mkdir dir="target/samples/security/client_repo/modules"/>
- <ant:copy file="resources/security/client.axis2.xml"
- tofile="target/samples/security/client_repo/conf/axis2.xml"/>
-
- <!-- Copy the sources and others ovrer to the target/samples/security-->
- <mkdir dir="target/samples/security/src/sample/security/"/>
- <ant:copy todir="target/samples/security/src/sample/security/">
- <ant:fileset dir="src/sample/security"/>
- </ant:copy>
-
- <ant:copy file="target/security/SecureService.aar"
- tofile="target/samples/security/SecureService.aar"/>
-
- <!-- copy the local libs -->
- <mkdir dir="target/samples/security/lib"/>
- <ant:copy file="target/security/secUtil.jar"
- tofile="target/samples/security/lib/secUtil.jar"/>
- <j:if test="${context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('on')}">
- <ant:copy file="${dependencies.dir}/xmlsec-${xmlsec.version}.jar"
- todir="target/samples/security/lib/"/>
- <ant:copy file="${dependencies.dir}/bcprov-${bcprov.version}.jar"
- todir="target/samples/security/lib/"/>
- <ant:copy file="${dependencies.dir}/wss4j-${wss4j.version}.jar"
- todir="target/samples/security/lib/"/>
- <ant:copy file="${dependencies.dir}/commons-discovery-${commons.discovery.version}.jar"
- todir="target/samples/security/lib/"/>
- </j:if>
- <j:if test="${context.getVariable('maven.jar.override').toString().trim().equalsIgnoreCase('off')}">
- <ant:copy file="${maven.repo.local}/xml-security/jars/xmlsec-${xmlsec.version}.jar"
- todir="target/samples/security/lib/"/>
- <ant:copy file="${maven.repo.local}/bouncycastle/jars/bcprov-${bcprov.version}.jar"
- todir="target/samples/security/lib/"/>
- <ant:copy file="${maven.repo.local}/wss4j/jars/wss4j-${wss4j.version}.jar"
- todir="target/samples/security/lib/"/>
- </j:if>
- <ant:copy file="resources/security/README.txt" tofile="target/samples/security/README.txt"/>
- <ant:copy file="resources/security/build.xml" tofile="target/samples/security/build.xml"/>
-
- <delete dir="target/security/"/>
-
- </goal>
-
- <!-- ================================================================ -->
- <!--- Eventing Sample -->
- <!-- ================================================================ -->
- <!--goal name="eventing">
-
- <property name="eventing.temp.dir" value="${samples.dir}/eventing/temp" />
- <property name="listner1.temp.dir" value="${eventing.temp.dir}/listner1" />
- <property name="listner2.temp.dir" value="${eventing.temp.dir}/listner2" />
- <property name="publisher.temp.dir" value="${eventing.temp.dir}/publisher" />
-
- <mkdir dir="${listner1.temp.dir}" />
- <mkdir dir="${listner1.temp.dir}/META-INF" />
- <mkdir dir="${listner2.temp.dir}" />
- <mkdir dir="${listner2.temp.dir}/META-INF" />
- <mkdir dir="${publisher.temp.dir}" />
- <mkdir dir="${publisher.temp.dir}/META-INF" />
-
- <copy toFile="${listner1.temp.dir}/META-INF/services.xml" file="resources/eventing/listner1.services.xml"/>
- <copy toFile="${listner2.temp.dir}/META-INF/services.xml" file="resources/eventing/listner2.services.xml"/>
- <copy toFile="${publisher.temp.dir}/META-INF/services.xml" file="resources/eventing/publisher.services.xml"/>
-
- <jar destfile="${samples.dir}/eventing/ListnerService1.aar">
- <fileset dir="target/classes">
- <include name="sample/eventing/**/**/*ListnerService1*" />
- </fileset>
- <fileset dir="${listner1.temp.dir}">
- <include name="META-INF/**"/>
- </fileset>
- </jar>
-
- <jar destfile="${samples.dir}/eventing/ListnerService2.aar">
- <fileset dir="target/classes">
- <include name="sample/eventing/**/**/*ListnerService2*" />
- </fileset>
- <fileset dir="${listner2.temp.dir}">
- <include name="META-INF/**"/>
- </fileset>
- </jar>
-
- <jar destfile="${samples.dir}/eventing/PublisherService.aar">
- <fileset dir="target/classes">
- <include name="sample/eventing/**/**/*PublisherService*" />
- </fileset>
- <fileset dir="${publisher.temp.dir}">
- <include name="META-INF/**"/>
- </fileset>
- </jar>
-
- <jar destfile="${samples.dir}/eventing/ListnerService1.aar">
- <fileset dir="target/classes">
- <include name="sample/eventing/**/**/*ListnerService1*" />
- </fileset>
- <fileset dir="${listner1.temp.dir}">
- <include name="META-INF/**"/>
- </fileset>
- </jar>
-
- <jar destfile="${samples.dir}/eventing/EventingSample.jar">
- <fileset dir="target/classes">
- <include name="sample/eventing/**"/>
- </fileset>
- </jar>
-
- <ant:copy todir="${samples.dir}/eventing">
- <ant:fileset dir="script/eventing"/>
- </ant:copy>
-
- </goal-->
-
-
- <preGoal name="itest:compile">
- <u:file var="file" name="${maven.itest.src}"/>
- <j:if test="${!file.exists()}">
- <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
- </j:if>
- </preGoal>
-
</project>
Modified: webservices/axis2/trunk/java/modules/samples/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/project.xml?view=diff&rev=534512&r1=534511&r2=534512
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/project.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/project.xml Wed May 2 08:23:51 2007
@@ -183,79 +183,6 @@
<nagEmailAddress>axis-dev@ws.apache.org</nagEmailAddress>
<sourceDirectory>src</sourceDirectory>
<unitTestSourceDirectory>test</unitTestSourceDirectory>
-
- <sourceModifications>
- <sourceModification>
- <className>fakeClass</className>
- <excludes>
- <exclude>**/eventing/**</exclude>
- </excludes>
- </sourceModification>
- </sourceModifications>
-
- <unitTest>
-
- <excludes>
- <exclude>**/*Abstract*.java</exclude>
- <exclude>**/*Util*.java</exclude>
- <exclude>**/*InteropStubTest.java</exclude>
- <exclude>**org/apache/axis2/mail/*.java</exclude>
- </excludes>
- <includes>
- <include>**/*Test.java</include>
- </includes>
-
- <resources>
- <resource>
- <directory>${basedir}/test-resources</directory>
- </resource>
- <resource>
- <directory>conf</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
-
- <resources>
- <resource>
- <directory>conf</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>test</directory>
- <includes>
- <include>**/*.jpg</include>
- </includes>
- </resource>
- <resource>
- <directory>../../</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- </resources>
</build>
-
<reports/>
-
</project>
Added: webservices/axis2/trunk/java/modules/samples/version/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/version/pom.xml?view=auto&rev=534512
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/version/pom.xml (added)
+++ webservices/axis2/trunk/java/modules/samples/version/pom.xml Wed May 2 08:23:51 2007
@@ -0,0 +1,60 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-parent</artifactId>
+ <version>SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
+ </parent>
+ <artifactId>version</artifactId>
+ <packaging>aar</packaging>
+ <name>Apache Axis 2.0 - Version Service</name>
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <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>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-aar-maven-plugin</artifactId>
+ <version>${version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <servicesXmlFile>${basedir}/src/sample/axisversion/META-INF/services.xml</servicesXmlFile>
+ <includeDependencies>false</includeDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+</project>
Modified: webservices/axis2/trunk/java/modules/webapp/conf/services.list
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/conf/services.list?view=diff&rev=534512&r1=534511&r2=534512
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/conf/services.list (original)
+++ webservices/axis2/trunk/java/modules/webapp/conf/services.list Wed May 2 08:23:51 2007
@@ -1 +1 @@
-version.aar
+version-@version@.aar
Modified: webservices/axis2/trunk/java/modules/webapp/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/pom.xml?view=diff&rev=534512&r1=534511&r2=534512
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/webapp/pom.xml Wed May 2 08:23:51 2007
@@ -299,6 +299,54 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>version</artifactId>
+ <version>${version}</version>
+ <type>aar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
<finalName>axis2-${version}</finalName>
@@ -327,6 +375,13 @@
</includes>
</resource>
<resource>
+ <directory>${basedir}/../samples/version/target</directory>
+ <targetPath>WEB-INF/services</targetPath>
+ <includes>
+ <include>version*.aar</include>
+ </includes>
+ </resource>
+ <resource>
<directory>${basedir}/../kernel/conf</directory>
<targetPath>WEB-INF/conf</targetPath>
<includes>
@@ -367,15 +422,15 @@
<resource>
<directory>${basedir}/conf</directory>
<targetPath>WEB-INF/services</targetPath>
- <filtering>true</filtering>
- <includes>
- <include>services.list</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/conf</directory>
- <targetPath>WEB-INF/modules</targetPath>
- <filtering>true</filtering>
+ <filtering>true</filtering>
+ <includes>
+ <include>services.list</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/conf</directory>
+ <targetPath>WEB-INF/modules</targetPath>
+ <filtering>true</filtering>
<includes>
<include>modules.list</include>
</includes>
Modified: webservices/axis2/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/pom.xml?view=diff&rev=534512&r1=534511&r2=534512
==============================================================================
--- webservices/axis2/trunk/java/pom.xml (original)
+++ webservices/axis2/trunk/java/pom.xml Wed May 2 08:23:51 2007
@@ -44,6 +44,7 @@
<module>modules/parent</module>
<module>modules/ping</module>
<module>modules/scripting</module>
+ <module>modules/samples/version</module>
<module>modules/soapmonitor</module>
<module>modules/spring</module>
<module>modules/tool/axis2-aar-maven-plugin</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org