Author: richard.opalka(a)jboss.com Date: 2010-01-12 05:23:27 -0500 (Tue, 12 Jan 2010) New Revision: 11388 Removed: framework/branches/jbossws-framework-3.1.2/profiles-example.xml framework/branches/jbossws-framework-3.1.2/src/main/etc/ framework/branches/jbossws-framework-3.1.2/src/main/scripts/build-install.xml Modified: framework/branches/jbossws-framework-3.1.2/pom.xml Log: [JBPAPP-3386] removing obsolete jboss.local.repository support Modified: framework/branches/jbossws-framework-3.1.2/pom.xml =================================================================== --- framework/branches/jbossws-framework-3.1.2/pom.xml 2010-01-12 10:22:03 UTC (rev 11387) +++ framework/branches/jbossws-framework-3.1.2/pom.xml 2010-01-12 10:23:27 UTC (rev 11388) @@ -137,40 +137,14 @@ <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> + <artifactId>maven-assembly-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> <id>testsuite</id> <phase>package</phase> <goals> @@ -195,5 +169,5 @@ </plugin> </plugins> </build> - + </project> Deleted: framework/branches/jbossws-framework-3.1.2/profiles-example.xml =================================================================== --- framework/branches/jbossws-framework-3.1.2/profiles-example.xml 2010-01-12 10:22:03 UTC (rev 11387) +++ framework/branches/jbossws-framework-3.1.2/profiles-example.xml 2010-01-12 10:23:27 UTC (rev 11388) @@ -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/branches/jbossws-framework-3.1.2/src/main/scripts/build-install.xml =================================================================== --- framework/branches/jbossws-framework-3.1.2/src/main/scripts/build-install.xml 2010-01-12 10:22:03 UTC (rev 11387) +++ framework/branches/jbossws-framework-3.1.2/src/main/scripts/build-install.xml 2010-01-12 10:23:27 UTC (rev 11388) @@ -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>