You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/08/20 00:50:11 UTC

svn commit: r432892 [8/8] - in /incubator/servicemix/trunk: ./ apache-servicemix/ apache-servicemix/src/main/assembly/ apache-servicemix/src/main/release/ant/ apache-servicemix/src/main/release/bin/ apache-servicemix/src/main/release/conf/ apache-servi...

Modified: incubator/servicemix/trunk/tooling/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml Sat Aug 19 15:49:53 2006
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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">
@@ -34,21 +53,15 @@
 			</releases>
 		</repository>
 	</repositories>
+	<properties>
+	  <xfire-version>1.2RC</xfire-version>
+	  <servicemix-version>3.0-incubating-SNAPSHOT</servicemix-version>
+	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>javax.xml</groupId>
-			<artifactId>jaxws-api</artifactId>
-			<version>2.0EA3</version>
-		</dependency>		
-		<dependency>
-			<groupId>xfire</groupId>
-			<artifactId>xfire-jsr181-api</artifactId>
-			<version>1.0-M1</version>
-		</dependency>
-		<dependency>
 			<groupId>org.apache.servicemix</groupId>
 			<artifactId>servicemix-jsr181</artifactId>
-			<version>3.0-incubating-SNAPSHOT</version>
+      <version>${servicemix-version}</version>      
 		</dependency>
 	</dependencies>
 	<build>
@@ -84,21 +97,17 @@
 								<taskdef
 									classname="org.codehaus.xfire.gen.WsGenTask" name="wsgen">
 									<classpath>
-										<pathelement
-											path="\${basedir}/target/classes" />
-										<path
-											refid="maven.test.classpath" />
+										<pathelement path="\${basedir}/target/classes" />
+										<path refid="maven.test.classpath" />
 									</classpath>
 								</taskdef>
 								<wsgen
 									wsdl="\${basedir}/src/main/resources/service.wsdl"
-									outputDirectory="\${basedir}/target/generated-sources"
+									outputDirectory="\$${basedir}/target/generated-sources"
 									profile="org.codehaus.xfire.jaxws.gen.JAXWSProfile"
 									explicitAnnotation="true" />
 							</tasks>
-							<sourceRoot>
-								\${basedir}/target/generated-sources
-							</sourceRoot>
+							<sourceRoot>\${basedir}/target/generated-sources</sourceRoot>
 						</configuration>
 						<goals>
 							<goal>run</goal>
@@ -109,19 +118,25 @@
 					<dependency>
 						<groupId>org.codehaus.xfire</groupId>
 						<artifactId>xfire-generator</artifactId>
-						<version>1.1.1</version>
+						<version>${xfire-version}</version>
+            <exclusions>
+              <exclusion>
+                <groupId>javax.xml</groupId>
+                <artifactId>jsr173</artifactId>
+              </exclusion>
+            </exclusions>
 					</dependency>
 					<dependency>
 						<groupId>org.codehaus.xfire</groupId>
 						<artifactId>xfire-jaxws</artifactId>
-						<version>1.1.1</version>
+						<version>${xfire-version}</version>
 					</dependency>
 				</dependencies>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.servicemix.tooling</groupId>
 				<artifactId>jbi-maven-plugin</artifactId>
-				<version>3.0-incubating-SNAPSHOT</version>
+        <version>${servicemix-version}</version>      
 				<extensions>true</extensions>
 			</plugin>
 		</plugins>

Modified: incubator/servicemix/trunk/tooling/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml Sat Aug 19 15:49:53 2006
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
 <beans xmlns:jsr181="http://servicemix.apache.org/jsr181/1.0">
 
     <classpath>
@@ -7,4 +26,4 @@
     <jsr181:endpoint pojoClass="put.your.implementation.here"
                      wsdlResource="classpath:service.wsdl" />
 
-</beans>
\ No newline at end of file
+</beans>

Modified: incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/pom.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/pom.xml Sat Aug 19 15:49:53 2006
@@ -15,8 +15,8 @@
     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.
+
 -->
-<!-- $Rev: 365333 $ $Date: 2006-01-02 12:21:09 +0100 (lun., 02 janv. 2006) $ -->
 <project 
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 

Modified: incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/src/main/resources/META-INF/maven/archetype.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/src/main/resources/META-INF/maven/archetype.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/src/main/resources/META-INF/maven/archetype.xml Sat Aug 19 15:49:53 2006
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
 <archetype>
   <id>servicemix-su</id>
   <resources>

Modified: incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml Sat Aug 19 15:49:53 2006
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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>
@@ -33,16 +52,19 @@
       </releases>
     </repository>
   </repositories>
+	<properties>
+	  <servicemix-version>3.0-incubating-SNAPSHOT</servicemix-version>
+	</properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-lwcontainer</artifactId>
-      <version>3.0-incubating-SNAPSHOT</version>      
+      <version>${servicemix-version}</version>      
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-components</artifactId>
-      <version>3.0-incubating-SNAPSHOT</version>      
+      <version>${servicemix-version}</version>      
     </dependency>
   </dependencies>
   <build>
@@ -58,7 +80,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>3.0-incubating-SNAPSHOT</version>
+        <version>${servicemix-version}</version>      
         <extensions>true</extensions>
       </plugin>     
     </plugins>

Modified: incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/src/main/resources/servicemix.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/src/main/resources/servicemix.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/src/main/resources/servicemix.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/src/main/resources/servicemix.xml Sat Aug 19 15:49:53 2006
@@ -1,4 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
 <beans xmlns:sm="http://servicemix.apache.org/config/1.0"
        xmlns:replaceMe="http://servicemix.apache.org/replaceMe">
 

Modified: incubator/servicemix/trunk/tooling/servicemix-service-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-service-assembly/pom.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-service-assembly/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-service-assembly/pom.xml Sat Aug 19 15:49:53 2006
@@ -15,8 +15,8 @@
     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.
+
 -->
-<!-- $Rev: 365333 $ $Date: 2006-01-02 12:21:09 +0100 (lun., 02 janv. 2006) $ -->
 <project 
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 

Modified: incubator/servicemix/trunk/tooling/servicemix-service-assembly/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-service-assembly/src/main/resources/META-INF/maven/archetype.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-service-assembly/src/main/resources/META-INF/maven/archetype.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-service-assembly/src/main/resources/META-INF/maven/archetype.xml Sat Aug 19 15:49:53 2006
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
 <archetype>
   <id>servicemix-sa</id>  
 </archetype>

Modified: incubator/servicemix/trunk/tooling/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml Sat Aug 19 15:49:53 2006
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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>
@@ -33,10 +52,9 @@
       </releases>
     </repository>
   </repositories>
-  <properties>
-    <servicemixVersion>3.0-incubating-SNAPSHOT</servicemixVersion>
-    <xbeanPluginVersion>2.4</xbeanPluginVersion>
-  </properties>
+	<properties>
+	  <servicemix-version>3.0-incubating-SNAPSHOT</servicemix-version>
+	</properties>
   <dependencies>    
     <dependency>
       <groupId>junit</groupId>
@@ -50,6 +68,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
+        <version>${servicemix-version}</version>      
         <extensions>true</extensions>
         <configuration>
           <type>service-assembly</type>         

Modified: incubator/servicemix/trunk/tooling/servicemix-service-engine/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-service-engine/pom.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-service-engine/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-service-engine/pom.xml Sat Aug 19 15:49:53 2006
@@ -15,8 +15,8 @@
     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.
+
 -->
-<!-- $Rev: 365333 $ $Date: 2006-01-02 12:21:09 +0100 (lun., 02 janv. 2006) $ -->
 <project 
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
@@ -32,5 +32,5 @@
 
   <artifactId>servicemix-service-engine</artifactId>
   <name>ServiceMix :: Maven2 :: Archetypes :: ServiceEngine</name>
-
+  
 </project>

Modified: incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/META-INF/maven/archetype.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/META-INF/maven/archetype.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/META-INF/maven/archetype.xml Sat Aug 19 15:49:53 2006
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
 <archetype>
   <id>servicemix-se</id>
   <sources>

Modified: incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml Sat Aug 19 15:49:53 2006
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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>
@@ -33,20 +52,20 @@
       </releases>
     </repository>
   </repositories>
-  <properties>
-    <servicemixVersion>3.0-incubating-SNAPSHOT</servicemixVersion>
-    <xbeanPluginVersion>2.4</xbeanPluginVersion>
-  </properties>
+	<properties>
+	  <xbean-version>2.6-SNAPSHOT</xbean-version>
+	  <servicemix-version>3.0-incubating-SNAPSHOT</servicemix-version>
+	</properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-shared</artifactId>      
-      <version>${servicemixVersion}</version>      
+      <version>${servicemix-version}</version>      
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-core</artifactId>
-      <version>${servicemixVersion}</version>
+      <version>${servicemix-version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -59,7 +78,8 @@
     <plugins>
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
-        <artifactId>jbi-maven-plugin</artifactId>        
+        <artifactId>jbi-maven-plugin</artifactId>   
+        <version>${servicemix-version}</version>     
         <extensions>true</extensions>
         <configuration>
           <type>service-engine</type>
@@ -70,7 +90,7 @@
       <plugin>
         <groupId>org.apache.xbean</groupId>
         <artifactId>maven-xbean-plugin</artifactId>
-        <version>${xbeanPluginVersion}</version>
+        <version>${xbean-version}</version>
         <executions>
           <execution>
             <configuration>

Modified: incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/archetype-resources/src/test/resources/spring.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/archetype-resources/src/test/resources/spring.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/archetype-resources/src/test/resources/spring.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/archetype-resources/src/test/resources/spring.xml Sat Aug 19 15:49:53 2006
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
 <beans xmlns:sm="http://servicemix.apache.org/config/1.0" 
 	     xmlns:my="http://${packageName}/1.0"
        xmlns:test="urn:test">

Modified: incubator/servicemix/trunk/tooling/servicemix-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-service-unit/pom.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-service-unit/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-service-unit/pom.xml Sat Aug 19 15:49:53 2006
@@ -15,8 +15,8 @@
     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.
+
 -->
-<!-- $Rev: 365333 $ $Date: 2006-01-02 12:21:09 +0100 (lun., 02 janv. 2006) $ -->
 <project 
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 

Modified: incubator/servicemix/trunk/tooling/servicemix-service-unit/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-service-unit/src/main/resources/META-INF/maven/archetype.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-service-unit/src/main/resources/META-INF/maven/archetype.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-service-unit/src/main/resources/META-INF/maven/archetype.xml Sat Aug 19 15:49:53 2006
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
 <archetype>
   <id>servicemix-su</id>
 </archetype>

Modified: incubator/servicemix/trunk/tooling/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml Sat Aug 19 15:49:53 2006
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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>
@@ -33,6 +52,9 @@
       </releases>
     </repository>
   </repositories>
+	<properties>
+	  <servicemix-version>3.0-incubating-SNAPSHOT</servicemix-version>
+	</properties>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -54,6 +76,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
+        <version>${servicemix-version}</version>      
         <extensions>true</extensions>
         <configuration>
           <type>service-unit</type>

Modified: incubator/servicemix/trunk/tooling/servicemix-shared-library/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-shared-library/pom.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-shared-library/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-shared-library/pom.xml Sat Aug 19 15:49:53 2006
@@ -15,8 +15,8 @@
     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.
+
 -->
-<!-- $Rev: 365333 $ $Date: 2006-01-02 12:21:09 +0100 (lun., 02 janv. 2006) $ -->
 <project 
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 

Modified: incubator/servicemix/trunk/tooling/servicemix-shared-library/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-shared-library/src/main/resources/META-INF/maven/archetype.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-shared-library/src/main/resources/META-INF/maven/archetype.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-shared-library/src/main/resources/META-INF/maven/archetype.xml Sat Aug 19 15:49:53 2006
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
 <archetype>
   <id>servicemix-su</id>
 </archetype>

Modified: incubator/servicemix/trunk/tooling/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml Sat Aug 19 15:49:53 2006
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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>
@@ -33,6 +52,9 @@
       </releases>
     </repository>
   </repositories> 
+	<properties>
+	  <servicemix-version>3.0-incubating-SNAPSHOT</servicemix-version>
+	</properties>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -54,7 +76,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>jbi-maven-plugin</artifactId>
-        <version>${servicemixJbiPluginVersion}</version>
+        <version>${servicemix-version}</version>      
         <extensions>true</extensions>       
       </plugin>     
     </plugins>

Modified: incubator/servicemix/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/xdocs/index.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/xdocs/index.xml (original)
+++ incubator/servicemix/trunk/xdocs/index.xml Sat Aug 19 15:49:53 2006
@@ -1,4 +1,22 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
 <document url="http://incubator.apache.org/servicemix/index.xml">
     <properties>
     <title>ServiceMix</title>

Modified: incubator/servicemix/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/xdocs/navigation.xml?rev=432892&r1=432891&r2=432892&view=diff
==============================================================================
--- incubator/servicemix/trunk/xdocs/navigation.xml (original)
+++ incubator/servicemix/trunk/xdocs/navigation.xml Sat Aug 19 15:49:53 2006
@@ -1,4 +1,22 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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 name="activemq" repository="activemq" href="http://activemq.org">
     <title>ActiveMQ</title>
     <body>