[jbossws-commits] JBossWS SVN: r6489 - in framework/trunk: src and 2 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Apr 18 05:35:10 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-04-18 05:35:10 -0400 (Fri, 18 Apr 2008)
New Revision: 6489
Added:
framework/trunk/profiles-example.xml
framework/trunk/src/
framework/trunk/src/main/
framework/trunk/src/main/ant/
framework/trunk/src/main/ant/build-install.xml
framework/trunk/src/test/
Removed:
framework/trunk/framework/
framework/trunk/src/main/
framework/trunk/src/main/ant/build-install.xml
framework/trunk/src/test/
Modified:
framework/trunk/
framework/trunk/pom.xml
Log:
Remove module. Add profiles.xml. Check properties
Property changes on: framework/trunk
___________________________________________________________________
Name: svn:ignore
- target
+ target
profiles.xml
Modified: framework/trunk/pom.xml
===================================================================
--- framework/trunk/pom.xml 2008-04-18 09:15:41 UTC (rev 6488)
+++ framework/trunk/pom.xml 2008-04-18 09:35:10 UTC (rev 6489)
@@ -4,8 +4,8 @@
<name>JBoss Web Services - Framework Parent</name>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework-parent</artifactId>
- <packaging>pom</packaging>
+ <artifactId>jbossws-framework</artifactId>
+ <packaging>jar</packaging>
<version>3.0.2-SNAPSHOT</version>
@@ -22,9 +22,144 @@
<version>3</version>
</parent>
- <!-- Modules -->
- <modules>
- <module>framework</module>
- </modules>
+ <!-- Properties -->
+ <properties>
+ <jbossws-common>3.0.0-SNAPSHOT</jbossws-common>
+ <jbossws-spi>3.0.0-SNAPSHOT</jbossws-spi>
+ </properties>
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxrpc-api</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ <version>1.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <version>${jbossws-common}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>${jbossws-spi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>2.0.0.CR8</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>tjws</groupId>
+ <artifactId>webserver</artifactId>
+ <version>1.3.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <!-- Plugins -->
+ <build>
+ <resources>
+ <resource>
+ <targetPath>../etc</targetPath>
+ <directory>src/main/etc</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <!-- http://jira.codehaus.org/browse/MANTRUN-87 -->
+ <property name="version.id" value="${project.version}"/>
+ <property name="jboss.local.repository" value="${jboss.local.repository}"/>
+ <ant antfile="src/main/ant/build-install.xml" target="install"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Added: framework/trunk/profiles-example.xml
===================================================================
--- framework/trunk/profiles-example.xml (rev 0)
+++ framework/trunk/profiles-example.xml 2008-04-18 09:35:10 UTC (rev 6489)
@@ -0,0 +1,16 @@
+<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">
+
+ <profiles>
+ <profile>
+ <id>user-profile</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <jboss.local.repository>/home/tdiesler/svn/jboss.local.repository</jboss.local.repository>
+ </properties>
+ </profile>
+ </profiles>
+
+</project>
\ No newline at end of file
Property changes on: framework/trunk/profiles-example.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: framework/trunk/src (from rev 6486, framework/trunk/framework/src)
Copied: framework/trunk/src/main (from rev 6488, framework/trunk/framework/src/main)
Copied: framework/trunk/src/main/ant (from rev 6486, framework/trunk/framework/ant)
Deleted: framework/trunk/src/main/ant/build-install.xml
===================================================================
--- framework/trunk/framework/ant/build-install.xml 2008-04-18 09:01:38 UTC (rev 6486)
+++ framework/trunk/src/main/ant/build-install.xml 2008-04-18 09:35:10 UTC (rev 6489)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project>
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="framework.dir" value="${basedir}"/>
- <property name="framework.etc.dir" value="${framework.dir}/src/main/etc"/>
- <property name="framework.target.dir" value="${framework.dir}/target"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="init">
- <property name="repository.id" value="${version.id}"/>
- <echo message="version.id=${version.id}"/>
- <echo message="repository.id=${repository.id}"/>
- <echo message="jboss.local.repository=${jboss.local.repository}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Installation -->
- <!-- ================================================================== -->
-
- <!-- Install to jboss.local.repository -->
- <target name="install" depends="init" description="Install to jboss.local.repository">
-
- <!-- Check if the target jar is available -->
- <available property="jbossws.framework.jar.available" file="${framework.target.dir}/jbossws-framework-${version.id}.jar"/>
- <fail message="Cannot find jbossws-framework-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.framework.jar.available"/>
-
- <!-- Check if the source jar is available -->
- <available property="jbossws.framework.sources.jar.available" file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar"/>
- <fail message="Cannot find jbossws-framework-${version.id}-sources.jar. Did you run 'mvn source:jar'?" unless="jbossws.framework.sources.jar.available"/>
-
- <!-- jboss/jbossws-framework -->
- <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/jbossws-framework/${repository.id}"/>
- <mkdir dir="${jboss.repository.dir}/lib"/>
- <copy file="${framework.target.dir}/jbossws-framework-${version.id}.jar" tofile="${jboss.repository.dir}//lib/jbossws-framework.jar" overwrite="true"/>
- <copy file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-framework-src.jar" overwrite="true"/>
- <copy file="${framework.target.dir}/jbossws-framework-${version.id}-scripts.zip" tofile="${jboss.repository.dir}/lib/jbossws-framework-scripts.zip" overwrite="true"/>
- <copy file="${framework.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/>
- </target>
-
-</project>
Copied: framework/trunk/src/main/ant/build-install.xml (from rev 6488, framework/trunk/framework/ant/build-install.xml)
===================================================================
--- framework/trunk/src/main/ant/build-install.xml (rev 0)
+++ framework/trunk/src/main/ant/build-install.xml 2008-04-18 09:35:10 UTC (rev 6489)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="framework.dir" value="${basedir}"/>
+ <property name="framework.etc.dir" value="${framework.dir}/src/main/etc"/>
+ <property name="framework.target.dir" value="${framework.dir}/target"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init">
+ <property name="repository.id" value="${version.id}"/>
+ <echo message="version.id=${version.id}"/>
+ <echo message="repository.id=${repository.id}"/>
+ <echo message="jboss.local.repository=${jboss.local.repository}"/>
+ </target>
+
+ <target name="check-properties" depends="init">
+ <available property="jboss.local.repository.available" type="dir" file="${jboss.local.repository}"/>
+ <fail message="Cannot find directory ${jboss.local.repository}. Did you copy profiles-example.xml?" unless="jboss.local.repository.available"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Installation -->
+ <!-- ================================================================== -->
+
+ <!-- Install to jboss.local.repository -->
+ <target name="install" depends="check-properties" description="Install to jboss.local.repository">
+
+ <!-- Check if the target jar is available -->
+ <available property="jbossws.framework.jar.available" file="${framework.target.dir}/jbossws-framework-${version.id}.jar"/>
+ <fail message="Cannot find jbossws-framework-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.framework.jar.available"/>
+
+ <!-- Check if the source jar is available -->
+ <available property="jbossws.framework.sources.jar.available" file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar"/>
+ <fail message="Cannot find jbossws-framework-${version.id}-sources.jar. Did you run 'mvn source:jar'?" unless="jbossws.framework.sources.jar.available"/>
+
+ <!-- jboss/jbossws-framework -->
+ <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/jbossws-framework/${repository.id}"/>
+ <mkdir dir="${jboss.repository.dir}/lib"/>
+ <copy file="${framework.target.dir}/jbossws-framework-${version.id}.jar" tofile="${jboss.repository.dir}//lib/jbossws-framework.jar" overwrite="true"/>
+ <copy file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-framework-src.jar" overwrite="true"/>
+ <copy file="${framework.target.dir}/jbossws-framework-${version.id}-scripts.zip" tofile="${jboss.repository.dir}/lib/jbossws-framework-scripts.zip" overwrite="true"/>
+ <copy file="${framework.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/>
+ </target>
+
+</project>
Copied: framework/trunk/src/test (from rev 6488, framework/trunk/framework/src/test)
More information about the jbossws-commits
mailing list