You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/08/10 17:05:20 UTC

svn commit: r984071 [7/8] - in /servicemix/archetypes/trunk: ./ servicemix-archetype-catalog/ servicemix-archetypes-itests/ servicemix-bean-service-unit/ servicemix-bean-service-unit/src/main/resources/META-INF/maven/ servicemix-bean-service-unit/src/m...

Added: servicemix/archetypes/trunk/servicemix-quartz-custom-marshaler-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-quartz-custom-marshaler-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml?rev=984071&view=auto
==============================================================================
--- servicemix/archetypes/trunk/servicemix-quartz-custom-marshaler-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml (added)
+++ servicemix/archetypes/trunk/servicemix-quartz-custom-marshaler-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml Tue Aug 10 15:05:12 2010
@@ -0,0 +1,52 @@
+<?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:scripting="http://servicemix.apache.org/quartz/1.0"
+    xmlns:replaceMe="http://servicemix.apache.org/replaceMe" xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://servicemix.apache.org/quartz/1.0 http://servicemix.apache.org/schema/servicemix-quartz-@{components-version}.xsd
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+    <!-- BEGIN SNIPPET: quartz-custom-marshaler -->
+    <quartz:endpoint service="replaceMe:serviceName"
+        endpoint="quartz-custom-marshaler" 
+        targetService="replaceMe:targetServiceName"
+        targetEndpoint="targetEndpoint">
+        <quartz:jobDetail>
+            <quartz:jobDetail>
+                <quartz:jobDataAsMap>
+                    <quartz:property key="xml"><![CDATA[
+              <hello>world</hello>
+            ]]></quartz:property>
+                </quartz:jobDataAsMap>
+            </quartz:jobDetail>
+        </quartz:jobDetail>
+
+        <quartz:triggers>
+            <quartz:simple repeatCount="0" repeatInterval="1000" />
+            <quartz:cron cronExpression="0 * 1 * * ?" />
+        </quartz:triggers>
+
+        <quartz:marshaler>
+            <bean class="CustomMarshaler" />
+        </quartz:marshaler>
+
+    </quartz:endpoint>
+    <!-- END SNIPPET: quartz-custom-marshaler -->
+
+</beans>

Propchange: servicemix/archetypes/trunk/servicemix-quartz-custom-marshaler-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/pom.xml?rev=984071&view=auto
==============================================================================
--- servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/pom.xml (added)
+++ servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/pom.xml Tue Aug 10 15:05:12 2010
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+    <!--
+
+        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.
+        
+    -->
+    
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>archetypes</artifactId>
+        <version>2010.01-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apache.servicemix.tooling</groupId>
+    <artifactId>servicemix-quartz-simple-trigger-service-unit</artifactId>
+    <name>Apache ServiceMix :: Archetypes :: Quartz Simple Trigger Service Unit</name>
+
+</project>
\ No newline at end of file

Propchange: servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/src/main/resources/META-INF/maven/archetype.xml?rev=984071&view=auto
==============================================================================
--- servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/src/main/resources/META-INF/maven/archetype.xml (added)
+++ servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/src/main/resources/META-INF/maven/archetype.xml Tue Aug 10 15:05:12 2010
@@ -0,0 +1,23 @@
+<?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-quartz-simple-trigger-service-unit</id>
+	<resources>
+		<resource>src/main/resources/xbean.xml</resource>
+	</resources>
+</archetype>
\ No newline at end of file

Propchange: servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/src/main/resources/META-INF/maven/archetype.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/src/main/resources/archetype-resources/pom.xml?rev=984071&view=auto
==============================================================================
--- servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/src/main/resources/archetype-resources/pom.xml (added)
+++ servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/src/main/resources/archetype-resources/pom.xml Tue Aug 10 15:05:12 2010
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+    <!--
+
+        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.
+        
+    -->
+    
+    <modelVersion>4.0.0</modelVersion>
+    
+    <groupId>${groupId}</groupId>
+    <artifactId>${artifactId}</artifactId>
+    <packaging>jbi-service-unit</packaging>
+    <version>${version}</version>
+    <name>Apache ServiceMix :: Quartz Simple Trigger Service Unit</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-quartz</artifactId>
+            <version>@{components.version}</version>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>jbi-maven-plugin</artifactId>
+                <version>@{jbi-maven-plugin.version}</version>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file

Propchange: servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/src/main/resources/archetype-resources/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml?rev=984071&view=auto
==============================================================================
--- servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml (added)
+++ servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml Tue Aug 10 15:05:12 2010
@@ -0,0 +1,36 @@
+<?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:scripting="http://servicemix.apache.org/quartz/1.0"
+    xmlns:replaceMe="http://servicemix.apache.org/replaceMe" xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://servicemix.apache.org/quartz/1.0 http://servicemix.apache.org/schema/servicemix-quartz-@{components-version}.xsd
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+    <!-- BEGIN SNIPPET: simple-trigger -->
+    <quartz:endpoint service="replaceMe:serviceName"
+        endpoint="simple-trigger" 
+        targetService="replaceMe:targetServiceName"
+        targetEndpoint="targetEndpoint">
+        <quartz:trigger>
+            <quartz:simple repeatCount="0" repeatInterval="1000" />
+        </quartz:trigger>
+    </quartz:endpoint>
+    <!-- END SNIPPET:  -->
+
+</beans>
\ No newline at end of file

Propchange: servicemix/archetypes/trunk/servicemix-quartz-simple-trigger-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/pom.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/pom.xml Tue Aug 10 15:05:12 2010
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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/xsd/maven-4.0.0.xsd">
 
-    <!--
+	<!--
 
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>archetypes</artifactId>
-        <version>2010.01-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>servicemix-saxon-xquery-service-unit</artifactId>
-    <name>ServiceMix :: Archetypes :: SaxonXQueryServiceUnit</name>
+		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.
+	-->
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.servicemix</groupId>
+		<artifactId>archetypes</artifactId>
+		<version>2010.01-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.servicemix.tooling</groupId>
+	<artifactId>servicemix-saxon-xquery-service-unit</artifactId>
+	<name>Apache ServiceMix :: Archetypes :: Saxon XQuery Service Unit</name>
 
-</project>
+</project>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/src/main/resources/META-INF/maven/archetype.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/src/main/resources/META-INF/maven/archetype.xml (original)
+++ servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/src/main/resources/META-INF/maven/archetype.xml Tue Aug 10 15:05:12 2010
@@ -18,9 +18,9 @@
 
 -->
 <archetype>
-  <id>servicemix-su</id>
+  <id>servicemix-saxon-xquery-service-unit</id>
   <resources>
     <resource>src/main/resources/xbean.xml</resource>
     <resource>src/main/resources/query.xq</resource>
   </resources>
-</archetype>
+</archetype>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml Tue Aug 10 15:05:12 2010
@@ -1,50 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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/xsd/maven-4.0.0.xsd">
 
-    <!--
+	<!--
 
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <version>${version}</version>
-    <name>A custom Saxon/X-Query service unit</name>
-    <url>http://www.myorganization.org</url>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-saxon</artifactId>
-            <version>@{components.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <defaultGoal>install</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <version>@{jbi-maven-plugin.version}</version>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+		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.
+	-->
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>jbi-service-unit</packaging>
+	<version>${version}</version>
+	<name>Apache ServiceMix :: Saxon/X-Query Service Unit</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.servicemix</groupId>
+			<artifactId>servicemix-saxon</artifactId>
+			<version>@{components.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<defaultGoal>install</defaultGoal>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.servicemix.tooling</groupId>
+				<artifactId>jbi-maven-plugin</artifactId>
+				<version>@{jbi-maven-plugin.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
+	
+</project>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml (original)
+++ servicemix/archetypes/trunk/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml Tue Aug 10 15:05:12 2010
@@ -25,12 +25,12 @@
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <!-- START SNIPPET: xquery --> 
-  <saxon:xquery service="replaceMe:xquery" endpoint="endpoint"
+  <saxon:xquery service="replaceMe:serviceName" endpoint="saxon-xquery"
                 resource="classpath:query.xq" />
   <!-- END SNIPPET: xquery --> 
   
   <!-- START SNIPPET: xquery-inline --> 
-  <saxon:xquery service="replaceMe:xquery-inline" endpoint="endpoint">
+  <saxon:xquery service="replaceMe:serviceName" endpoint="saxon-xquery-inline">
     <!-- CDATA are not supported currently -->
     <saxon:query>
       for $x in /bookstore/book
@@ -44,7 +44,7 @@
   <!-- END SNIPPET: xquery-inline --> 
   
   <!-- START SNIPPET: xquery-dynamic -->
-  <saxon:xquery service="replaceMe:xquery-dynamic" endpoint="endpoint">
+  <saxon:xquery service="replaceMe:serviceName" endpoint="saxon-xquery-dynamic">
     <saxon:expression>
       <bean class="org.apache.servicemix.expression.PropertyExpression">
         <property name="property" value="xquery.source" />

Modified: servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/pom.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/pom.xml Tue Aug 10 15:05:12 2010
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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/xsd/maven-4.0.0.xsd">
 
-    <!--
+	<!--
 
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>archetypes</artifactId>
-        <version>2010.01-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>servicemix-saxon-xslt-service-unit</artifactId>
-    <name>ServiceMix :: Archetypes :: SaxonXsltServiceUnit</name>
+		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.
+	-->
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.servicemix</groupId>
+		<artifactId>archetypes</artifactId>
+		<version>2010.01-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.servicemix.tooling</groupId>
+	<artifactId>servicemix-saxon-xslt-service-unit</artifactId>
+	<name>Apache ServiceMix :: Archetypes :: Saxon XSLT Service Unit</name>
 
-</project>
+</project>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/META-INF/maven/archetype.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/META-INF/maven/archetype.xml (original)
+++ servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/META-INF/maven/archetype.xml Tue Aug 10 15:05:12 2010
@@ -18,9 +18,9 @@
 
 -->
 <archetype>
-  <id>servicemix-su</id>
+  <id>servicemix-saxon-xslt-service-unit</id>
   <resources>
     <resource>src/main/resources/xbean.xml</resource>
     <resource>src/main/resources/transform.xsl</resource>
   </resources>
-</archetype>
+</archetype>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml Tue Aug 10 15:05:12 2010
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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/xsd/maven-4.0.0.xsd">
 
-    <!--
+	<!--
 
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <version>${version}</version>
-    <name>A customer Saxon/XSLT service unit</name>
-    <url>http://www.myorganization.org</url>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-saxon</artifactId>
-            <version>@{components.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <defaultGoal>install</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <version>@{jbi-maven-plugin.version}</version>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+		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.
+	-->
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>jbi-service-unit</packaging>
+	<version>${version}</version>
+	<name>Apache ServiceMix :: Saxon/XSLT Service Unit</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.servicemix</groupId>
+			<artifactId>servicemix-saxon</artifactId>
+			<version>@{components.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<defaultGoal>install</defaultGoal>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.servicemix.tooling</groupId>
+				<artifactId>jbi-maven-plugin</artifactId>
+				<version>@{jbi-maven-plugin.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
+	
+</project>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml (original)
+++ servicemix/archetypes/trunk/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml Tue Aug 10 15:05:12 2010
@@ -24,19 +24,19 @@
        xsi:schemaLocation="http://servicemix.apache.org/saxon/1.0 http://servicemix.apache.org/schema/servicemix-saxon-@{components-version}.xsd
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-  <!-- START SNIPPET: xslt --> 
-  <saxon:xslt service="replaceMe:xslt" endpoint="endpoint"
+  <!--  START SNIPPET: saxon-xslt -->
+  <saxon:xslt service="replaceMe:serviceName" endpoint="saxon-xslt"
               resource="classpath:transform.xsl" />
-  <!-- END SNIPPET: xslt --> 
+  <!--  END SNIPPED: saxon-xslt -->           
   
-  <!-- START SNIPPET: xslt-dynamic -->
-  <saxon:xslt service="replaceMe:xslt-dynamic" endpoint="endpoint">
+  <!-- START SNIPPET: saxon-xslt-dynamic -->
+  <saxon:xslt service="replaceMe:serviceName" endpoint="saxon-xslt-dynamic">
     <saxon:expression>
       <bean class="org.apache.servicemix.expression.PropertyExpression">
         <property name="property" value="xslt.source" />
       </bean>
     </saxon:expression>
   </saxon:xslt>
-  <!-- END SNIPPET: xslt-dynamic -->
+  <!-- END SNIPPET: saxon-xslt-dynamic -->
 
-</beans>
+</beans>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-script-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-script-service-unit/pom.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-script-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-script-service-unit/pom.xml Tue Aug 10 15:05:12 2010
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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/xsd/maven-4.0.0.xsd">
 
-    <!--
+	<!--
 
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>archetypes</artifactId>
-        <version>2010.01-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>servicemix-script-service-unit</artifactId>
-    <name>ServiceMix :: Archetypes :: ScriptServiceUnit</name>
+		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.
+	-->
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.servicemix</groupId>
+		<artifactId>archetypes</artifactId>
+		<version>2010.01-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.servicemix.tooling</groupId>
+	<artifactId>servicemix-script-service-unit</artifactId>
+	<name>Apache ServiceMix :: Archetypes :: Script Service Unit</name>
 
-</project>
+</project>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-script-service-unit/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-script-service-unit/src/main/resources/META-INF/maven/archetype.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-script-service-unit/src/main/resources/META-INF/maven/archetype.xml (original)
+++ servicemix/archetypes/trunk/servicemix-script-service-unit/src/main/resources/META-INF/maven/archetype.xml Tue Aug 10 15:05:12 2010
@@ -18,7 +18,7 @@
 
 -->
 <archetype>
-    <id>servicemix-su</id>
+    <id>servicemix-script-service-unit</id>
     <resources>
         <resource>src/main/resources/xbean.xml</resource>
     </resources>

Modified: servicemix/archetypes/trunk/servicemix-script-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-script-service-unit/src/main/resources/archetype-resources/pom.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-script-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-script-service-unit/src/main/resources/archetype-resources/pom.xml Tue Aug 10 15:05:12 2010
@@ -1,50 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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/xsd/maven-4.0.0.xsd">
 
-    <!--
+	<!--
 
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <version>${version}</version>
-    <name>A custom script service unit</name>
-    <url>http://www.myorganization.org</url>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-script</artifactId>
-            <version>@{components.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <defaultGoal>install</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <version>@{jbi-maven-plugin.version}</version>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
+		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.
+	-->
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>jbi-service-unit</packaging>
+	<version>${version}</version>
+	<name>Apache ServiceMix :: Script Service Unit</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.servicemix</groupId>
+			<artifactId>servicemix-script</artifactId>
+			<version>@{components.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<defaultGoal>install</defaultGoal>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.servicemix.tooling</groupId>
+				<artifactId>jbi-maven-plugin</artifactId>
+				<version>@{jbi-maven-plugin.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 
-</project>         
+</project>         
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-script-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-script-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-script-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml (original)
+++ servicemix/archetypes/trunk/servicemix-script-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml Tue Aug 10 15:05:12 2010
@@ -24,8 +24,9 @@
        xsi:schemaLocation="
             http://servicemix.apache.org/script/1.0 http://servicemix.apache.org/schema/servicemix-script-@{components-version}.xsd
             http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-        
-    <script:exchangeProcessor service="replaceMe:groovy" endpoint="endpoint">
+    
+    <!-- BEGIN SNIPPET: groovy -->    
+    <script:exchangeProcessor service="replaceMe:serviceName" endpoint="groovy">
         <property name="helpers">
             <list>
                 <ref bean="groovyExchangeHelper"/>
@@ -44,5 +45,6 @@
         </lang:inline-script>
         <lang:property name="exchangeHelper" ref="groovyExchangeHelper"/>
     </lang:groovy>
+    <!-- END SNIPPED: groovy -->
             
 </beans>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-scripting-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-scripting-service-unit/pom.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-scripting-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-scripting-service-unit/pom.xml Tue Aug 10 15:05:12 2010
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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/xsd/maven-4.0.0.xsd">
 
-    <!--
+	<!--
 
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>archetypes</artifactId>
-        <version>2010.01-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>servicemix-scripting-service-unit</artifactId>
-    <name>ServiceMix :: Archetypes :: ScriptingServiceUnit</name>
+		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.
+	-->
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.servicemix</groupId>
+		<artifactId>archetypes</artifactId>
+		<version>2010.01-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.servicemix.tooling</groupId>
+	<artifactId>servicemix-scripting-service-unit</artifactId>
+	<name>Apache ServiceMix :: Archetypes :: Scripting Service Unit</name>
 
-</project>
+</project>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/META-INF/maven/archetype.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/META-INF/maven/archetype.xml (original)
+++ servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/META-INF/maven/archetype.xml Tue Aug 10 15:05:12 2010
@@ -18,11 +18,11 @@
 
 -->
 <archetype>
-  <id>servicemix-su</id>
+  <id>servicemix-scripting-service-unit</id>
   <resources>
     <resource>src/main/resources/xbean.xml</resource>   
     <resource>src/main/resources/GroovyExchangeProcessorJSR223.groovy</resource>
     <resource>src/main/resources/RubyExchangeProcessorJSR223.rb</resource>
     <resource>src/main/resources/JSExchangeProcessorJSR223.js</resource>
   </resources>
-</archetype>
+</archetype>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/archetype-resources/pom.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/archetype-resources/pom.xml Tue Aug 10 15:05:12 2010
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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/xsd/maven-4.0.0.xsd">
 
-    <!--
+	<!--
 
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <version>${version}</version>
-    <name>A custom scripting service unit</name>
-    <url>http://www.myorganization.org</url>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-scripting</artifactId>
-            <version>@{components.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <defaultGoal>install</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <version>@{jbi-maven-plugin.version}</version>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+		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.
+	-->
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>jbi-service-unit</packaging>
+	<version>${version}</version>
+	<name>Apache ServiceMix :: Scripting Service Unit</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.servicemix</groupId>
+			<artifactId>servicemix-scripting</artifactId>
+			<version>@{components.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<defaultGoal>install</defaultGoal>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.servicemix.tooling</groupId>
+				<artifactId>jbi-maven-plugin</artifactId>
+				<version>@{jbi-maven-plugin.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
+	
+</project>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml (original)
+++ servicemix/archetypes/trunk/servicemix-scripting-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml Tue Aug 10 15:05:12 2010
@@ -27,29 +27,32 @@
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"
        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
        
-    <!-- Groovy JSR-223 Endpoint  -->
+    <!-- BEGIN SNIPPET: groovy-jsr223  -->
     <scripting:endpoint
-        service="replaceMe:groovy-jsr223" 
-        endpoint="endpoint"
+        service="replaceMe:serviceName" 
+        endpoint="groovy-jsr223"
         script="classpath:GroovyExchangeProcessorJSR223.groovy"
         bindings="#customBindings">
     </scripting:endpoint>
+    <!-- END SNIPPET: groovy-jsr223 -->
             
-    <!-- JRuby JSR-223 Endpoint  -->
+    <!-- BEGIN SNIPPET: jruby-jsr223  -->
     <scripting:endpoint
-        service="replaceMe:jruby-jsr223" 
-        endpoint="endpoint"
+        service="replaceMe:serviceName" 
+        endpoint="jruby-jsr223"
         script="classpath:RubyExchangeProcessorJSR223.rb"
         bindings="#customBindings">
     </scripting:endpoint>
+    <!-- END SNIPPET: jruby-jsr223 -->
             
-    <!-- JavaScript JSR-223 Endpoint  -->
+    <!-- BEGIN SNIPPET: javascript-jsr223 -->
     <scripting:endpoint
-        service="replaceMe:js-jsr223" 
-        endpoint="endpoint"
+        service="replaceMe:serviceName" 
+        endpoint="javascript-jsr223"
         script="classpath:JSExchangeProcessorJSR223.js"
         bindings="#customBindings">
     </scripting:endpoint>
+    <!-- END SNIPPET -->
             
     <util:map id="customBindings">
         <entry key="answerGroovy" value="JSR-223 with Groovy is working fine..." />

Modified: servicemix/archetypes/trunk/servicemix-service-assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-service-assembly/pom.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-service-assembly/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-service-assembly/pom.xml Tue Aug 10 15:05:12 2010
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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/xsd/maven-4.0.0.xsd">
 
-    <!--
+	<!--
 
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>archetypes</artifactId>
-        <version>2010.01-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>servicemix-service-assembly</artifactId>
-    <name>ServiceMix :: Archetypes :: ServiceAssembly</name>
+		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.
+	-->
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.servicemix</groupId>
+		<artifactId>archetypes</artifactId>
+		<version>2010.01-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.servicemix.tooling</groupId>
+	<artifactId>servicemix-service-assembly</artifactId>
+	<name>Apache ServiceMix :: Archetypes :: Service Assembly</name>
 
-</project>
+</project>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-service-assembly/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-service-assembly/src/main/resources/META-INF/maven/archetype.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-service-assembly/src/main/resources/META-INF/maven/archetype.xml (original)
+++ servicemix/archetypes/trunk/servicemix-service-assembly/src/main/resources/META-INF/maven/archetype.xml Tue Aug 10 15:05:12 2010
@@ -18,5 +18,5 @@
 
 -->
 <archetype>
-  <id>servicemix-sa</id>  
-</archetype>
+  <id>servicemix-service-assembly</id>  
+</archetype>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml Tue Aug 10 15:05:12 2010
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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/xsd/maven-4.0.0.xsd">
 
-    <!--
+	<!--
 
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <packaging>jbi-service-assembly</packaging>
-    <version>${version}</version>
-    <name>A custom service assembly</name>
-    <url>http://www.myorganization.org</url>
-
-    <dependencies>
-        <!-- Add your service units dependencies here -->
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <version>@{jbi-maven-plugin.version}</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <type>service-assembly</type>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+		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.
+	-->
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>jbi-service-assembly</packaging>
+	<version>${version}</version>
+	<name>Apache ServiceMix :: Service Assembly</name>
+
+	<dependencies>
+		<!-- Add your service units dependencies here -->
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.servicemix.tooling</groupId>
+				<artifactId>jbi-maven-plugin</artifactId>
+				<version>@{jbi-maven-plugin.version}</version>
+				<extensions>true</extensions>
+				<configuration>
+					<type>service-assembly</type>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	
+</project>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-service-engine/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-service-engine/pom.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-service-engine/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-service-engine/pom.xml Tue Aug 10 15:05:12 2010
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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/xsd/maven-4.0.0.xsd">
 
-    <!--
+	<!--
 
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>archetypes</artifactId>
-        <version>2010.01-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>servicemix-service-engine</artifactId>
-    <name>ServiceMix :: Archetypes :: ServiceEngine</name>
+		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.
+	-->
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.servicemix</groupId>
+		<artifactId>archetypes</artifactId>
+		<version>2010.01-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.servicemix.tooling</groupId>
+	<artifactId>servicemix-service-engine</artifactId>
+	<name>Apache ServiceMix :: Archetypes :: Service Engine</name>
 
-</project>
+</project>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-service-engine/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-service-engine/src/main/resources/META-INF/maven/archetype.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-service-engine/src/main/resources/META-INF/maven/archetype.xml (original)
+++ servicemix/archetypes/trunk/servicemix-service-engine/src/main/resources/META-INF/maven/archetype.xml Tue Aug 10 15:05:12 2010
@@ -18,7 +18,7 @@
 
 -->
 <archetype>
-  <id>servicemix-se</id>
+  <id>servicemix-service-engine</id>
   <sources>
     <source>src/main/java/MyComponent.java</source>
     <source>src/main/java/MyEndpoint.java</source>

Modified: servicemix/archetypes/trunk/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml Tue Aug 10 15:05:12 2010
@@ -1,102 +1,163 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
 
-    <!--
+	<!--
 
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <packaging>jbi-component</packaging>
-    <version>${version}</version>
-    <name>A custom service engine component</name>
-    <url>http://www.myorganization.org</url>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-shared</artifactId>
-            <version>@{components.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-common</artifactId>
-            <version>@{components.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
-            <version>@{servicemix-specs.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta-_1.1_spec</artifactId>
-            <version>@{geronimo-specs.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-core</artifactId>
-            <version>@{servicemix.version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-jmx</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>@{junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <version>@{jbi-maven-plugin.version}</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <type>service-engine</type>
-                    <component>${packageName}.MyComponent</component>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>maven-xbean-plugin</artifactId>
-                <version>@{xbean.version}</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <namespace>http://${packageName}/1.0</namespace>
-                        </configuration>
-                        <goals>
-                            <goal>mapping</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+		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.
+	-->
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>jbi-component</packaging>
+	<version>${version}</version>
+	<name>Apache ServiceMix :: Custom Service Engine Component</name>
+	
+	<properties>
+	   <servicemix.osgi.import>
+	       !@{packageName}*,
+	       org.apache.servicemix.common,
+	       org.apache.servicemix.common.osgi,
+	       org.apache.servicemix.executors.impl,
+	       org.apache.servicemix.jbi.container*;resolution:=optional,
+	       org.apache.servicemix.jbi.framework*;resolution:=optional,
+	       org.apache.xbean.spring.context.v2,
+	       org.springframework.beans.factory.xml,
+	       sun.misc;resolution:=optional,
+	       *
+	   </servicemix.osgi.import>
+	   <servicemix.osgi.export>
+	       ${packageName}*;version=${version}
+	   </servicemix.osgi.export>
+	   <servicemix.osgi.dynamic.import>
+	       javax.*,org.w3c.*,org.xml.*
+	   </servicemix.osgi.dynamic.import>
+	   <servicemix.osgi.private />
+	   <servicemix.osgi.bundles>
+	       org.springframework.core,
+	       org.springframework.beans,
+	       org.springframework.context,
+	   </servicemix.osgi.bundles>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.servicemix</groupId>
+			<artifactId>servicemix-shared</artifactId>
+			<version>@{components.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.servicemix</groupId>
+			<artifactId>servicemix-common</artifactId>
+			<version>@{components.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.servicemix.specs</groupId>
+			<artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
+			<version>@{servicemix-specs.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.servicemix</groupId>
+			<artifactId>servicemix-core</artifactId>
+			<version>@{servicemix.version}</version>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-jmx</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>@{junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.servicemix.tooling</groupId>
+				<artifactId>jbi-maven-plugin</artifactId>
+				<version>@{jbi-maven-plugin.version}</version>
+				<extensions>true</extensions>
+				<configuration>
+					<type>service-engine</type>
+					<component>${packageName}.MyComponent</component>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.xbean</groupId>
+				<artifactId>maven-xbean-plugin</artifactId>
+				<version>@{xbean.version}</version>
+				<executions>
+					<execution>
+						<configuration>
+							<namespace>http://${packageName}/1.0</namespace>
+						</configuration>
+						<goals>
+							<goal>mapping</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+			     <groupId>org.apache.felix</groupId>
+			     <artifactId>maven-bundle-plugin</artifactId>
+			     <version>@{maven-bundle-plugin.version}</version>
+			     <configuration>
+			         <instructions>
+			             <Bundle-Name>${project.name}</Bundle-Name>
+			             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+			             <Export-Package>${servicemix.osgi.export}</Export-Package>
+			             <Import-Package>${servicemix.osgi.import}</Import-Package>
+			             <DynamicImport-Package>${servicemix.osgi.dynamic.import}</DynamicImport-Package>
+			             <Private-Package>${servicemix.osgi.private}</Private-Package>
+			             <Require-Bundle>${servicemix.osgi.bundles}</Require-Bundle>
+			         </instructions>
+			         <supportedProjectTypes>
+			             <supportedProjectType>jar</supportedProjectType>
+			             <supportedProjectType>bundle</supportedProjectType>
+			             <supportedProjectType>jbi-component</supportedProjectType>
+			             <supportedProjectType>jbi-shared-library</supportedProjectType>
+			         </supportedProjectTypes>
+			         <unpackBundle>true</unpackBundle>
+			     </configuration>
+			     <executions>
+			         <execution>
+			             <id>bundle-manifest</id>
+			             <phase>process-classes</phase>
+			             <goals>
+			                 <goal>manifest</goal>
+			             </goals>
+			         </execution>
+			     </executions>
+			</plugin>
+			<plugin>
+			     <groupId>org.apache.maven.plugins</groupId>
+			     <artifactId>maven-jar-plugin</artifactId>
+			     <configuration>
+			         <useDefaultManifestFile>true</useDefaultManifestFile>
+			     </configuration>
+			</plugin>
+		</plugins>
+	</build>
+	
+</project>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-service-unit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-service-unit/pom.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-service-unit/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-service-unit/pom.xml Tue Aug 10 15:05:12 2010
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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/xsd/maven-4.0.0.xsd">
 
-    <!--
+	<!--
 
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>archetypes</artifactId>
-        <version>2010.01-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.tooling</groupId>
-    <artifactId>servicemix-service-unit</artifactId>
-    <name>ServiceMix :: Archetypes :: ServiceUnit</name>
+		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.
+	-->
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.servicemix</groupId>
+		<artifactId>archetypes</artifactId>
+		<version>2010.01-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.servicemix.tooling</groupId>
+	<artifactId>servicemix-service-unit</artifactId>
+	<name>Apache ServiceMix :: Archetypes :: Service Unit</name>
 
-</project>
+</project>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-service-unit/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-service-unit/src/main/resources/META-INF/maven/archetype.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-service-unit/src/main/resources/META-INF/maven/archetype.xml (original)
+++ servicemix/archetypes/trunk/servicemix-service-unit/src/main/resources/META-INF/maven/archetype.xml Tue Aug 10 15:05:12 2010
@@ -18,5 +18,5 @@
 
 -->
 <archetype>
-  <id>servicemix-su</id>
-</archetype>
+  <id>servicemix-service-unit</id>
+</archetype>
\ No newline at end of file

Modified: servicemix/archetypes/trunk/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml?rev=984071&r1=984070&r2=984071&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml Tue Aug 10 15:05:12 2010
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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/xsd/maven-4.0.0.xsd">
 
-    <!--
+	<!--
 
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <version>${version}</version>
-    <name>A custom service unit</name>
-    <url>http://www.myorganization.org</url>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>@{junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <defaultGoal>true</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <version>@{jbi-maven-plugin.version}</version>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+		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.
+	-->
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<packaging>jbi-service-unit</packaging>
+	<version>${version}</version>
+	<name>Apache ServiceMix :: Service Unit</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>@{junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<defaultGoal>true</defaultGoal>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.servicemix.tooling</groupId>
+				<artifactId>jbi-maven-plugin</artifactId>
+				<version>@{jbi-maven-plugin.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
+	
+</project>
\ No newline at end of file