1:30 a.m.
Author: richard.opalka(a)jboss.com
Date: 2009-11-25 02:30:57 -0500 (Wed, 25 Nov 2009)
New Revision: 11151
Removed:
framework/trunk/profiles-example.xml
framework/trunk/src/main/etc/
framework/trunk/src/main/scripts/build-install.xml
Modified:
framework/trunk/pom.xml
Log:
[JBWS-2839] removing jboss.local.repository support
Modified: framework/trunk/pom.xml
===================================================================
--- framework/trunk/pom.xml 2009-11-25 07:30:31 UTC (rev 11150)
+++ framework/trunk/pom.xml 2009-11-25 07:30:57 UTC (rev 11151)
@@ -24,11 +24,11 @@
<!-- Properties -->
<properties>
+ <jbossws.spi.version>1.2.2-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>1.2.2-SNAPSHOT</jbossws.common.version>
<jaxrpc.api.version>1.1</jaxrpc.api.version>
<jaxws.api.version>2.1</jaxws.api.version>
<jboss.web.version>2.1.3.GA</jboss.web.version>
- <jbossws.common.version>1.2.1.GA</jbossws.common.version>
- <jbossws.spi.version>1.2.2-SNAPSHOT</jbossws.spi.version>
<jbossxb.version>2.0.1.GA</jbossxb.version>
</properties>
@@ -84,34 +84,8 @@
<!-- 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/scripts/build-install.xml"
target="install" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
Deleted: framework/trunk/profiles-example.xml
===================================================================
--- framework/trunk/profiles-example.xml 2009-11-25 07:30:31 UTC (rev 11150)
+++ framework/trunk/profiles-example.xml 2009-11-25 07:30:57 UTC (rev 11151)
@@ -1,20 +0,0 @@
-<profilesXml 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/xsd/profiles-1.0.0.xsd">
-
- <!-- This profile can also be defined in ~/.m2/settings.xml -->
- <profiles>
- <profile>
- <id>user-profile</id>
- <activation>
- <property>
- <name>user.name</name>
- </property>
- </activation>
- <properties>
- <!-- The location of the legacy jboss repository -->
-
<jboss.local.repository>/home/tdiesler/svn/jboss.local.repository</jboss.local.repository>
- </properties>
- </profile>
- </profiles>
-
-</profilesXml>
\ No newline at end of file
Deleted: framework/trunk/src/main/scripts/build-install.xml
===================================================================
--- framework/trunk/src/main/scripts/build-install.xml 2009-11-25 07:30:31 UTC (rev
11150)
+++ framework/trunk/src/main/scripts/build-install.xml 2009-11-25 07:30:57 UTC (rev
11151)
@@ -1,61 +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. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<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}/etc/component-info.xml"
tofile="${jboss.repository.dir}/component-info.xml"
overwrite="true"/>
- </target>
-
-</project>