servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r565371 - in /incubator/servicemix/trunk: ./ archetypes/ distributions/apache-servicemix/ distributions/apache-servicemix/src/main/assembly/ distributions/apache-servicemix/src/main/release/bin/ distributions/apache-servicemix/src/main/rele...
Date Mon, 13 Aug 2007 15:07:23 GMT
Author: gnodet
Date: Mon Aug 13 08:07:22 2007
New Revision: 565371

URL: http://svn.apache.org/viewvc?view=rev&rev=565371
Log:
Fix remaining manually changes during the release process

Modified:
    incubator/servicemix/trunk/archetypes/pom.xml
    incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml
    incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml
    incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch
    incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat
    incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
    incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
    incubator/servicemix/trunk/pom.xml

Modified: incubator/servicemix/trunk/archetypes/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/archetypes/pom.xml?view=diff&rev=565371&r1=565370&r2=565371
==============================================================================
--- incubator/servicemix/trunk/archetypes/pom.xml (original)
+++ incubator/servicemix/trunk/archetypes/pom.xml Mon Aug 13 08:07:22 2007
@@ -84,60 +84,58 @@
 					<filters>
 						<servicemix-version>${servicemix-version}</servicemix-version>
 						<xbean-version>${xbean-version}</xbean-version>
-						<camel-version>1.1-SNAPSHOT</camel-version>
+						<camel-version>${camel-version}</camel-version>
 						<xfire-version>${xfire-version}</xfire-version>
-						<releases-repo>http://people.apache.org/repo/m2-incubating-repository</releases-repo>
-						<snapshots-repo>http://people.apache.org/repo/m2-snapshot-repository</snapshots-repo>
-						<repositories><![CDATA[ 
-						  <pluginRepositories>
-						    <pluginRepository>
-						      <id>apache.incubating</id>
-						      <name>Apache Incubating Repository</name>
-						      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-						      <snapshots>
-						        <enabled>false</enabled>
-						      </snapshots>
-						      <releases>
-						         <enabled>true</enabled>
-						      </releases>
-						    </pluginRepository>
-						    <pluginRepository>
-						      <id>apache.snapshots</id>
-						      <name>Apache Snapshots Repository</name>
-						      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-						      <snapshots>
-						        <enabled>true</enabled>
-						      </snapshots>
-						      <releases>
-						         <enabled>false</enabled>
-						      </releases>
-						    </pluginRepository>
-						  </pluginRepositories>
-						  <repositories>
-						    <repository>
-						      <id>apache.incubating</id>
-						      <name>Apache Incubating Repository</name>
-						      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-						      <snapshots>
-						        <enabled>false</enabled>
-						      </snapshots>
-						      <releases>
-						         <enabled>true</enabled>
-						      </releases>
-						    </repository>
-						    <repository>
-						      <id>apache.snapshots</id>
-						      <name>Apache Snapshots Repository</name>
-						      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-						      <snapshots>
-						        <enabled>true</enabled>
-						      </snapshots>
-						      <releases>
-						         <enabled>false</enabled>
-						      </releases>
-						    </repository>
-						  </repositories>
-						]]></repositories>
+						<repositories><![CDATA[  
+  <pluginRepositories>
+    <pluginRepository>
+      <id>${releases-repo-id}</id>
+      <name>${releases-repo-name}</name>
+      <url>${releases-repo-url}</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+	</pluginRepository>
+	<pluginRepository>
+	  <id>${snapshots-repo-id}</id>
+	  <name>${snapshots-repo-name}</name>
+	  <url>${snapshots-repo-url}</url>
+	  <snapshots>
+	    <enabled>true</enabled>
+	  </snapshots>
+	  <releases>
+	    <enabled>false</enabled>
+	  </releases>
+	</pluginRepository>
+  </pluginRepositories>
+  <repositories>
+    <repository>
+      <id>${releases-repo-id}</id>
+      <name>${releases-repo-name}</name>
+      <url>${releases-repo-url}</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+    <repository>
+      <id>${snapshots-repo-id}</id>
+      <name>${snapshots-repo-name}</name>
+      <url>${snapshots-repo-url}</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
+  </repositories>
+]]></repositories>
 					</filters>
 				</configuration>
 				<executions>

Modified: incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml?view=diff&rev=565371&r1=565370&r2=565371
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml Mon Aug 13 08:07:22
2007
@@ -481,6 +481,27 @@
         </executions>
       </plugin>
       <plugin>
+	    <inherited>true</inherited>
+		<groupId>org.apache.servicemix.tooling</groupId>
+		<artifactId>res-maven-plugin</artifactId>
+		<version>${servicemix-version}</version>
+		<configuration>
+		  <inputDirectory>${basedir}/src/main/release</inputDirectory>
+		  <outputDirectory>${basedir}/target/filtered</outputDirectory>
+		  <filters>
+		    <servicemix-version>${servicemix-version}</servicemix-version>
+		    <releases-repo-url>${releases-repo-url}</releases-repo-url>
+		  </filters>
+		</configuration>
+		<executions>
+		  <execution>
+			<goals>
+			  <goal>resources</goal>
+		    </goals>
+          </execution>
+		</executions>
+	  </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>${mavenAssemblyPluginVersion}</version>

Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml?view=diff&rev=565371&r1=565370&r2=565371
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml Mon
Aug 13 08:07:22 2007
@@ -36,14 +36,14 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>src/main/release</directory>
+      <directory>target/filtered</directory>
       <outputDirectory>/</outputDirectory>
       <excludes>
         <exclude>bin</exclude>
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>src/main/release/bin</directory>
+      <directory>target/filtered/bin</directory>
       <outputDirectory>/bin</outputDirectory>
       <fileMode>755</fileMode>
     </fileSet>

Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch?view=diff&rev=565371&r1=565370&r2=565371
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch
(original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch
Mon Aug 13 08:07:22 2007
@@ -19,7 +19,7 @@
 #
 
 if [ "$SERVICEMIX_VERSION" = "" ] ; then
-  SERVICEMIX_VERSION=3.2-incubating-SNAPSHOT
+  SERVICEMIX_VERSION=@{servicemix-version}
 fi
 
 if [ "$DEF_GROUP_ID" = "" ] ; then
@@ -87,7 +87,7 @@
 fi
 
 mvn archetype:create \
-  -DremoteRepositories=http://people.apache.org/repo/m2-incubating-repository \
+  -DremoteRepositories=@{releases-repo-url} \
   -DarchetypeGroupId=org.apache.servicemix.tooling \
   -DarchetypeArtifactId=$ARCHETYPE \
   -DarchetypeVersion=$SERVICEMIX_VERSION \

Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat?view=diff&rev=565371&r1=565370&r2=565371
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat
(original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat
Mon Aug 13 08:07:22 2007
@@ -21,7 +21,7 @@
 rem 
 
 if "%SERVICEMIX_VERSION%" == "" (
-    set SERVICEMIX_VERSION=3.2-incubating-SNAPSHOT
+    set SERVICEMIX_VERSION=@{servicemix-version}
 )
 
 if "%DEF_GROUP_ID%" == "" (
@@ -101,7 +101,7 @@
 shift
 goto setArgs
 :doneSetArgs
-mvn archetype:create -DremoteRepositories=http://people.apache.org/repo/m2-incubating-repository
-DarchetypeGroupId=org.apache.servicemix.tooling -DarchetypeArtifactId=%ARCHETYPE% -DarchetypeVersion=%SERVICEMIX_VERSION%
-DgroupId=%DEF_GROUP_ID% -DartifactId=%DEF_ARTIFACT_ID% %CMD_LINE_ARGS%
+mvn archetype:create -DremoteRepositories=@{releases-repo-url} -DarchetypeGroupId=org.apache.servicemix.tooling
-DarchetypeArtifactId=%ARCHETYPE% -DarchetypeVersion=%SERVICEMIX_VERSION% -DgroupId=%DEF_GROUP_ID%
-DartifactId=%DEF_ARTIFACT_ID% %CMD_LINE_ARGS%
 goto end
 
 :end

Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml?view=diff&rev=565371&r1=565370&r2=565371
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
(original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
Mon Aug 13 08:07:22 2007
@@ -25,8 +25,8 @@
 
   <!-- We need to include the WS-Notification component dependencies in the classpath
-->
   <classpath>
-    <location>../lib/servicemix-wsn2005-3.1-incubating-SNAPSHOT.jar</location>
-    <location>../lib/servicemix-common-3.1-incubating-SNAPSHOT.jar</location>
+    <location>../lib/servicemix-wsn2005-@{servicemix-version}.jar</location>
+    <location>../lib/servicemix-common-@{servicemix-version}.jar</location>
     <location>../lib/jaxb-api-2.0.jar</location>
     <location>../lib/jaxb-impl-2.0.1.jar</location>
     <location>../lib/xfire-jsr181-api-1.0-M1.jar</location>

Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml?view=diff&rev=565371&r1=565370&r2=565371
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
(original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
Mon Aug 13 08:07:22 2007
@@ -25,8 +25,8 @@
 
   <!-- We need to include the WS-Notification component dependencies in the classpath
-->
   <classpath>
-    <location>../lib/servicemix-wsn2005-3.1-incubating-SNAPSHOT.jar</location>
-    <location>../lib/servicemix-common-3.1-incubating-SNAPSHOT.jar</location>
+    <location>../lib/servicemix-wsn2005-@{servicemix-version}.jar</location>
+    <location>../lib/servicemix-common-@{servicemix-version}.jar</location>
     <location>../lib/jaxb-api-2.0.jar</location>
     <location>../lib/jaxb-impl-2.0.1.jar</location>
     <location>../lib/xfire-jsr181-api-1.0-M1.jar</location>

Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?view=diff&rev=565371&r1=565370&r2=565371
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Mon Aug 13 08:07:22 2007
@@ -215,7 +215,13 @@
         <sitemesh-version>2.2.1</sitemesh-version>
         <woden-version>1.0.0M6</woden-version>
         <cxf-version>2.1-incubator-SNAPSHOT</cxf-version>
-        <topDirectoryLocation>.</topDirectoryLocation>
+
+		<releases-repo-id>apache.incubating</releases-repo-id>
+		<releases-repo-name>Apache Incubating Repository</releases-repo-name>
+		<releases-repo-url>http://people.apache.org/repo/m2-incubating-repository</releases-repo-url>
+		<snapshots-repo-id>apache.snapshots</snapshots-repo-id>
+		<snapshots-repo-name>Apache Snapshots Repository</snapshots-repo-name>
+		<snapshots-repo-url>http://people.apache.org/repo/m2-snapshot-repository</snapshots-repo-url>
     </properties>
 
     <profiles>



Mime
View raw message