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/18 10:07:15 UTC

svn commit: r986589 - in /servicemix/archetypes/trunk: servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/ servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/java/ servicemix-bean-service-unit/src/main/re...

Author: jbonofre
Date: Wed Aug 18 08:07:13 2010
New Revision: 986589

URL: http://svn.apache.org/viewvc?rev=986589&view=rev
Log:
Update intergration tests to use the latest archetype.
Begin to add comment in xbean.

Added:
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfBcServiceUnitTest.java   (contents, props changed)
      - copied, changed from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfBCConsumerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSeServiceUnitTest.java   (contents, props changed)
      - copied, changed from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSEServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSeWsdlFirstServiceUnitTest.java   (contents, props changed)
      - copied, changed from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSEWsdlFirstServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/EipServiceUnitTest.java   (contents, props changed)
      - copied, changed from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/EIPServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FileServiceUnitTest.java
      - copied, changed from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FilePollerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpServiceUnitTest.java   (contents, props changed)
      - copied, changed from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpPollerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/HttpServiceUnitTest.java   (contents, props changed)
      - copied, changed from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/HttpConsumerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/JmsServiceUnitTest.java   (contents, props changed)
      - copied, changed from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/JmsConsumerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/Jsr181ServiceUnitTest.java   (contents, props changed)
      - copied, changed from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/Jsr181AnnotatedServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/MailServiceUnitTest.java
      - copied, changed from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/MailPollerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/OsWorkflowServiceUnitTest.java
      - copied unchanged from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/OSWorkflowServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/QuartzServiceUnitTest.java   (contents, props changed)
      - copied, changed from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/QuartzCronTriggerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SaxonServiceUnitTest.java   (contents, props changed)
      - copied, changed from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SaxonXQueryServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SmppServiceUnitTest.java   (contents, props changed)
      - copied, changed from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SmppConsumerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SnmpServiceUnitTest.java   (contents, props changed)
      - copied, changed from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SnmpPollerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/VfsServiceUnitTest.java   (contents, props changed)
      - copied, changed from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/VfsPollerServiceUnitTest.java
Removed:
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfBCConsumerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfBCProviderServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSEServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSEWsdlFirstServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/EIPServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FilePollerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FileSenderServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpPollerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpSenderServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/HttpConsumerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/HttpProviderServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/HttpSoapConsumerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/HttpSoapProviderServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/JmsConsumerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/JmsJcaConsumerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/JmsProviderServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/JmsSoapConsumerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/JmsSoapProviderServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/Jsr181AnnotatedServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/MailPollerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/MailSenderServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/OSWorkflowServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/QuartzCronTriggerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/QuartzCustomMarshalerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/QuartzSimpleTriggerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SaxonXQueryServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SaxonXsltServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SmppConsumerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SmppProviderServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SnmpPollerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SnmpTrapConsumerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/VfsPollerServiceUnitTest.java
    servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/VfsSenderServiceUnitTest.java
Modified:
    servicemix/archetypes/trunk/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/java/MyBean.java
    servicemix/archetypes/trunk/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
    servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyComponent.java
    servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyConsumerEndpoint.java
    servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyEndpointType.java
    servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyProviderEndpoint.java
    servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/test/java/MySpringComponentTest.java
    servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/test/resources/spring.xml
    servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/src/main/java/MyTransform.java
    servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
    servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/pom.xml
    servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java
    servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/src/main/resources/camel-context.xml
    servicemix/archetypes/trunk/servicemix-cxf-bc-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml

Copied: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfBcServiceUnitTest.java (from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfBCConsumerServiceUnitTest.java)
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfBcServiceUnitTest.java?p2=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfBcServiceUnitTest.java&p1=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfBCConsumerServiceUnitTest.java&r1=986049&r2=986589&rev=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfBCConsumerServiceUnitTest.java (original)
+++ servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfBcServiceUnitTest.java Wed Aug 18 08:07:13 2010
@@ -19,7 +19,7 @@ package org.apache.servicemix.tooling;
 public class CxfBCConsumerServiceUnitTest extends AbstractArchetypeTest {
 
     public void testCxfBCConsumerServiceUnit() throws Exception {
-        testServiceMixArchetype("cxf-bc-consumer-service-unit");
+        testServiceMixArchetype("cxf-bc-service-unit");
     }
 
 }

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfBcServiceUnitTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfBcServiceUnitTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSeServiceUnitTest.java (from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSEServiceUnitTest.java)
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSeServiceUnitTest.java?p2=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSeServiceUnitTest.java&p1=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSEServiceUnitTest.java&r1=986049&r2=986589&rev=986589&view=diff
==============================================================================
    (empty)

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSeServiceUnitTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSeServiceUnitTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSeWsdlFirstServiceUnitTest.java (from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSEWsdlFirstServiceUnitTest.java)
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSeWsdlFirstServiceUnitTest.java?p2=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSeWsdlFirstServiceUnitTest.java&p1=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSEWsdlFirstServiceUnitTest.java&r1=986049&r2=986589&rev=986589&view=diff
==============================================================================
    (empty)

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSeWsdlFirstServiceUnitTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/CxfSeWsdlFirstServiceUnitTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/EipServiceUnitTest.java (from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/EIPServiceUnitTest.java)
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/EipServiceUnitTest.java?p2=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/EipServiceUnitTest.java&p1=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/EIPServiceUnitTest.java&r1=986049&r2=986589&rev=986589&view=diff
==============================================================================
    (empty)

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/EipServiceUnitTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/EipServiceUnitTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/EipServiceUnitTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FileServiceUnitTest.java (from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FilePollerServiceUnitTest.java)
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FileServiceUnitTest.java?p2=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FileServiceUnitTest.java&p1=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FilePollerServiceUnitTest.java&r1=986049&r2=986589&rev=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FilePollerServiceUnitTest.java (original)
+++ servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FileServiceUnitTest.java Wed Aug 18 08:07:13 2010
@@ -19,7 +19,7 @@ package org.apache.servicemix.tooling;
 public class FilePollerServiceUnitTest extends AbstractArchetypeTest {
 
     public void testFilePollerServiceUnit() throws Exception {
-        testServiceMixArchetype("file-poller-service-unit");
+        testServiceMixArchetype("file-service-unit");
     }
 
 }

Copied: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpServiceUnitTest.java (from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpPollerServiceUnitTest.java)
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpServiceUnitTest.java?p2=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpServiceUnitTest.java&p1=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpPollerServiceUnitTest.java&r1=986049&r2=986589&rev=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpPollerServiceUnitTest.java (original)
+++ servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpServiceUnitTest.java Wed Aug 18 08:07:13 2010
@@ -19,7 +19,7 @@ package org.apache.servicemix.tooling;
 public class FtpPollerServiceUnitTest extends AbstractArchetypeTest {
 
     public void testFtpPollerServiceUnit() throws Exception {
-        testServiceMixArchetype("ftp-poller-service-unit");
+        testServiceMixArchetype("ftp-service-unit");
     }
 
 }

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpServiceUnitTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpServiceUnitTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/FtpServiceUnitTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/HttpServiceUnitTest.java (from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/HttpConsumerServiceUnitTest.java)
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/HttpServiceUnitTest.java?p2=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/HttpServiceUnitTest.java&p1=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/HttpConsumerServiceUnitTest.java&r1=986049&r2=986589&rev=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/HttpConsumerServiceUnitTest.java (original)
+++ servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/HttpServiceUnitTest.java Wed Aug 18 08:07:13 2010
@@ -19,7 +19,7 @@ package org.apache.servicemix.tooling;
 public class HttpConsumerServiceUnitTest extends AbstractArchetypeTest {
 
     public void testHttpConsumerServiceUnit() throws Exception {
-        testServiceMixArchetype("http-consumer-service-unit");
+        testServiceMixArchetype("http-service-unit");
     }
 
 }

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/HttpServiceUnitTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/HttpServiceUnitTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/HttpServiceUnitTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/JmsServiceUnitTest.java (from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/JmsConsumerServiceUnitTest.java)
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/JmsServiceUnitTest.java?p2=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/JmsServiceUnitTest.java&p1=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/JmsConsumerServiceUnitTest.java&r1=986049&r2=986589&rev=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/JmsConsumerServiceUnitTest.java (original)
+++ servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/JmsServiceUnitTest.java Wed Aug 18 08:07:13 2010
@@ -19,7 +19,7 @@ package org.apache.servicemix.tooling;
 public class JmsConsumerServiceUnitTest extends AbstractArchetypeTest {
 
     public void testJmsConsumerServiceUnit() throws Exception {
-        testServiceMixArchetype("jms-consumer-service-unit");
+        testServiceMixArchetype("jms-service-unit");
     }
 
 }

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/JmsServiceUnitTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/JmsServiceUnitTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/JmsServiceUnitTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/Jsr181ServiceUnitTest.java (from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/Jsr181AnnotatedServiceUnitTest.java)
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/Jsr181ServiceUnitTest.java?p2=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/Jsr181ServiceUnitTest.java&p1=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/Jsr181AnnotatedServiceUnitTest.java&r1=986049&r2=986589&rev=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/Jsr181AnnotatedServiceUnitTest.java (original)
+++ servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/Jsr181ServiceUnitTest.java Wed Aug 18 08:07:13 2010
@@ -19,7 +19,7 @@ package org.apache.servicemix.tooling;
 public class Jsr181AnnotatedServiceUnitTest extends AbstractArchetypeTest {
 
     public void testJsr181AnnotatedServiceUnit() throws Exception {
-        testServiceMixArchetype("jsr181-annotated-service-unit");
+        testServiceMixArchetype("jsr181-service-unit");
     }
 
 }

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/Jsr181ServiceUnitTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/Jsr181ServiceUnitTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/Jsr181ServiceUnitTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/MailServiceUnitTest.java (from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/MailPollerServiceUnitTest.java)
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/MailServiceUnitTest.java?p2=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/MailServiceUnitTest.java&p1=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/MailPollerServiceUnitTest.java&r1=986049&r2=986589&rev=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/MailPollerServiceUnitTest.java (original)
+++ servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/MailServiceUnitTest.java Wed Aug 18 08:07:13 2010
@@ -19,7 +19,7 @@ package org.apache.servicemix.tooling;
 public class MailPollerServiceUnitTest extends AbstractArchetypeTest {
 
     public void testMailPollerServiceUnit() throws Exception {
-        testServiceMixArchetype("mail-poller-service-unit");
+        testServiceMixArchetype("mail-service-unit");
     }
 
 }

Copied: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/QuartzServiceUnitTest.java (from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/QuartzCronTriggerServiceUnitTest.java)
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/QuartzServiceUnitTest.java?p2=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/QuartzServiceUnitTest.java&p1=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/QuartzCronTriggerServiceUnitTest.java&r1=986049&r2=986589&rev=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/QuartzCronTriggerServiceUnitTest.java (original)
+++ servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/QuartzServiceUnitTest.java Wed Aug 18 08:07:13 2010
@@ -19,7 +19,7 @@ package org.apache.servicemix.tooling;
 public class QuartzCronTriggerServiceUnitTest extends AbstractArchetypeTest {
     
     public void testQuartzCronTriggerServiceUnit() throws Exception {
-        testServiceMixArchetype("quartz-cron-trigger-service-unit");
+        testServiceMixArchetype("quartz-service-unit");
     }
 
 }

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/QuartzServiceUnitTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SaxonServiceUnitTest.java (from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SaxonXQueryServiceUnitTest.java)
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SaxonServiceUnitTest.java?p2=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SaxonServiceUnitTest.java&p1=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SaxonXQueryServiceUnitTest.java&r1=986049&r2=986589&rev=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SaxonXQueryServiceUnitTest.java (original)
+++ servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SaxonServiceUnitTest.java Wed Aug 18 08:07:13 2010
@@ -19,7 +19,7 @@ package org.apache.servicemix.tooling;
 public class SaxonXQueryServiceUnitTest extends AbstractArchetypeTest {
 
     public void testSaxonXQueryServiceUnit() throws Exception {
-        testServiceMixArchetype("saxon-xquery-service-unit");
+        testServiceMixArchetype("saxon-service-unit");
     }
 
 }

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SaxonServiceUnitTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SaxonServiceUnitTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SaxonServiceUnitTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SmppServiceUnitTest.java (from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SmppConsumerServiceUnitTest.java)
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SmppServiceUnitTest.java?p2=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SmppServiceUnitTest.java&p1=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SmppConsumerServiceUnitTest.java&r1=986049&r2=986589&rev=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SmppConsumerServiceUnitTest.java (original)
+++ servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SmppServiceUnitTest.java Wed Aug 18 08:07:13 2010
@@ -19,7 +19,7 @@ package org.apache.servicemix.tooling;
 public class SmppConsumerServiceUnitTest extends AbstractArchetypeTest {
     
     public void testSmppConsumerServiceUnit() throws Exception {
-        testServiceMixArchetype("smpp-consumer-service-unit");
+        testServiceMixArchetype("smpp-service-unit");
     }
 
 }

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SmppServiceUnitTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SnmpServiceUnitTest.java (from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SnmpPollerServiceUnitTest.java)
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SnmpServiceUnitTest.java?p2=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SnmpServiceUnitTest.java&p1=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SnmpPollerServiceUnitTest.java&r1=986049&r2=986589&rev=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SnmpPollerServiceUnitTest.java (original)
+++ servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SnmpServiceUnitTest.java Wed Aug 18 08:07:13 2010
@@ -19,7 +19,7 @@ package org.apache.servicemix.tooling;
 public class SnmpPollerServiceUnitTest extends AbstractArchetypeTest {
     
     public void testSnmpPollerServiceUnit() throws Exception {
-        testServiceMixArchetype("snmp-poller-service-unit");
+        testServiceMixArchetype("snmp-service-unit");
     }
 
 }

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/SnmpServiceUnitTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/VfsServiceUnitTest.java (from r986049, servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/VfsPollerServiceUnitTest.java)
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/VfsServiceUnitTest.java?p2=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/VfsServiceUnitTest.java&p1=servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/VfsPollerServiceUnitTest.java&r1=986049&r2=986589&rev=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/VfsPollerServiceUnitTest.java (original)
+++ servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/VfsServiceUnitTest.java Wed Aug 18 08:07:13 2010
@@ -19,7 +19,7 @@ package org.apache.servicemix.tooling;
 public class VfsPollerServiceUnitTest extends AbstractArchetypeTest {
     
     public void testVfsPollerServiceUnit() throws Exception {
-        testServiceMixArchetype("vfs-poller-service-unit");
+        testServiceMixArchetype("vfs-service-unit");
     }
 
 }

Propchange: servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/java/org/apache/servicemix/tooling/VfsServiceUnitTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: servicemix/archetypes/trunk/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/java/MyBean.java
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/java/MyBean.java?rev=986589&r1=986588&r2=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/java/MyBean.java (original)
+++ servicemix/archetypes/trunk/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/java/MyBean.java Wed Aug 18 08:07:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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.
- */
 package ${packageName};
 
 import org.apache.servicemix.MessageExchangeListener;

Modified: servicemix/archetypes/trunk/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml?rev=986589&r1=986588&r2=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml (original)
+++ servicemix/archetypes/trunk/servicemix-bean-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml Wed Aug 18 08:07:13 2010
@@ -4,14 +4,35 @@
        xmlns:bean="http://servicemix.apache.org/bean/1.0"
        xmlns:replaceMe="http://servicemix.apache.org/replaceMe"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://servicemix.apache.org/bean/1.0 http://servicemix.apache.org/schema/servicemix-bean-@{components-version}.xsd
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+       xsi:schemaLocation="http://servicemix.apache.org/bean/1.0 http://servicemix.apache.org/schema/servicemix-bean-@{components.version}.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <!-- 
+    A bean endpoint provides integration of beans (POJOs) with the JBI bus to make it easy
+    to use POJOs to process JBI messages exchanges.
+    Like in a MDB in JEE, a POJO will receive a message from the NMR and process it
+    in any way it likes.
+    
+    See the bean component wiki page:
+    
+        http://servicemix.apache.org/servicemix-bean.html
+  -->
+
+  <!-- 
+    The bean endpoint allows to set a bean or beanName. The bean will create a single
+    instance of the POJO per endpoint whereas the beanName will create an instance
+    per request (message exchange).
+  
     Attributes:
         service         : the bean endpoint service name
         endpoint        : the bean endpoint name
-        bean            : the POJO bean used by the endpoint     : 
+        bean            : the POJO bean used by the endpoint
+        beanName        : the POJO bean name used by the endpoint 
+  -->
+  
+  <!-- BEGIN SNIPPET: bean -->
+  <!-- 
+    Simple endpoint which exposed myBean into the NMR.
   -->
   <bean:endpoint service="replaceMe:serviceName" endpoint="bean" bean="#myBean"/>
 
@@ -19,5 +40,6 @@
     The POJO used by the bean endpoint. 
   -->
   <bean id="myBean" class="${packageName}.MyBean"/>
+  <!-- END SNIPPET: bean -->
 
 </beans>

Modified: servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyComponent.java
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyComponent.java?rev=986589&r1=986588&r2=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyComponent.java (original)
+++ servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyComponent.java Wed Aug 18 08:07:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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.
- */
 package ${packageName};
 
 import java.util.List;

Modified: servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyConsumerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyConsumerEndpoint.java?rev=986589&r1=986588&r2=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyConsumerEndpoint.java (original)
+++ servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyConsumerEndpoint.java Wed Aug 18 08:07:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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.
- */
 package ${packageName};
 
 import javax.jbi.management.DeploymentException;

Modified: servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyEndpointType.java
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyEndpointType.java?rev=986589&r1=986588&r2=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyEndpointType.java (original)
+++ servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyEndpointType.java Wed Aug 18 08:07:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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.
- */
 package ${packageName};
 
 /**

Modified: servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyProviderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyProviderEndpoint.java?rev=986589&r1=986588&r2=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyProviderEndpoint.java (original)
+++ servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/main/java/MyProviderEndpoint.java Wed Aug 18 08:07:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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.
- */
 package ${packageName};
 
 import javax.jbi.management.DeploymentException;

Modified: servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/test/java/MySpringComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/test/java/MySpringComponentTest.java?rev=986589&r1=986588&r2=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/test/java/MySpringComponentTest.java (original)
+++ servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/test/java/MySpringComponentTest.java Wed Aug 18 08:07:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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.
- */
 package ${packageName};
 
 import javax.jbi.messaging.InOut;

Modified: servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/test/resources/spring.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/test/resources/spring.xml?rev=986589&r1=986588&r2=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/test/resources/spring.xml (original)
+++ servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/src/test/resources/spring.xml Wed Aug 18 08:07:13 2010
@@ -1,22 +1,5 @@
 <?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.
-
--->
+<!-- Generated by Apache ServiceMix Archetype -->
 <beans xmlns:sm="http://servicemix.apache.org/config/1.0" 
 	     xmlns:my="http://${packageName}/1.0"
        xmlns:test="urn:test">

Modified: servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/pom.xml?rev=986589&r1=986588&r2=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/pom.xml Wed Aug 18 08:07:13 2010
@@ -1,22 +1,7 @@
 <?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.
-	-->
+	<!-- Generated by Apache ServiceMix Archetype -->
 
 	<modelVersion>4.0.0</modelVersion>
 

Modified: servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/src/main/java/MyTransform.java
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/src/main/java/MyTransform.java?rev=986589&r1=986588&r2=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/src/main/java/MyTransform.java (original)
+++ servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/src/main/java/MyTransform.java Wed Aug 18 08:07:13 2010
@@ -1,19 +1,3 @@
-/**
- * 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.
- */
 package ${packageName};
 
 import java.util.Date;
@@ -21,9 +5,6 @@ import java.util.Date;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-/**
- * @version $Revision: 640450 $
- */
 public class MyTransform  {
     private static final transient Log LOG = LogFactory.getLog(MyTransform.class);
     private boolean verbose = true;

Modified: servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml?rev=986589&r1=986588&r2=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml (original)
+++ servicemix/archetypes/trunk/servicemix-camel-osgi-bundle/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml Wed Aug 18 08:07:13 2010
@@ -1,21 +1,5 @@
 <?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.
--->
-
+<!-- Generated by Apache ServiceMix Archetype -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:osgi="http://camel.apache.org/schema/osgi"

Modified: servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/pom.xml?rev=986589&r1=986588&r2=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/pom.xml Wed Aug 18 08:07:13 2010
@@ -1,23 +1,8 @@
 <?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.
-	-->
-
+	<!-- Generated by Apache ServiceMix Archetype -->
+	
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>${groupId}</groupId>

Modified: servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java?rev=986589&r1=986588&r2=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java (original)
+++ servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java Wed Aug 18 08:07:13 2010
@@ -1,19 +1,3 @@
-/**
- * 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.
- */
 package ${packageName};
 
 import org.apache.camel.Exchange;
@@ -22,8 +6,6 @@ import org.apache.camel.builder.RouteBui
 
 /**
  * A Camel Router
- *
- * @version $Revision: 1.1 $
  */
 public class MyRouteBuilder extends RouteBuilder {
 

Modified: servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/src/main/resources/camel-context.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/src/main/resources/camel-context.xml?rev=986589&r1=986588&r2=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/src/main/resources/camel-context.xml (original)
+++ servicemix/archetypes/trunk/servicemix-camel-service-unit/src/main/resources/archetype-resources/src/main/resources/camel-context.xml Wed Aug 18 08:07:13 2010
@@ -1,27 +1,33 @@
 <?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.
-	-->
+<!-- Generated by Apache ServiceMix Archetype -->
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
        http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
+       
+    <!-- 
+        Camel component provides support for using Apache Camel to provide a full set
+        of Enterprise Integration Pattern and flexible routing and transformation
+        in both Java code or Spring XML to route services on the NMR.
+        
+            http://servicemix.apache.org/servicemix-camel.html
+            http://camel.apache.org
+    -->
+    
+    <!-- 
+        A Camel endpoint uses a Camel camel-context.xml descriptor in place of the standard
+        xbean.xml one.
+        The camel-context.xml allows you to define your route as you want.
+    -->
 
     <!-- BEGIN SNIPPET: camel -->
+    <!-- 
+        Simple routing between SEDA endpoint. Camel supports jbi:, jms:, etc protocols/components.
+        
+            http://camel.apache.org/components.html 
+        
+    -->
 	<camelContext id="camel"
 		xmlns="http://activemq.apache.org/camel/schema/spring">
 		<route>

Modified: servicemix/archetypes/trunk/servicemix-cxf-bc-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
URL: http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-cxf-bc-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml?rev=986589&r1=986588&r2=986589&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-cxf-bc-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml (original)
+++ servicemix/archetypes/trunk/servicemix-cxf-bc-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml Wed Aug 18 08:07:13 2010
@@ -7,13 +7,78 @@
 	xsi:schemaLocation="http://servicemix.apache.org/cxfbc/1.0 http://servicemix.apache.org/schema/servicemix-cxfbc-@{components-version}.xsd
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
+    <!-- 
+        Service CXF-BC component uses Apache CXF internally to work with HTTP/SOAP or JMS/SOAP messages.
+        
+        It supports:
+            - SOAP 1.1 and 1.2
+            - MIME attachments
+            - all MEPs as consumers or providers
+            - SSL
+            - WS-Security
+            - WS-Policy
+            - WS-RM
+            - WS-Addressing
+    -->
+
+    <!-- == CONSUMER ENDPOINT == -->
+    
+    <!-- 
+        A consumer endpoint is a server side CXF endpoint that will consume
+        plain HTTP+SOAP requests and send them into the NMR to a given JBI
+        endpoint, which is called a proxied endpoint.
+        
+        Attributes:
+            wsdl                    : the WSDL will be retrieved from the given location
+            service                 : the service name of the proxied endpoint
+            endpoint                : the endpoint name of the proxied endpoint
+            interfaceName           : the interface name of the proxied endpoint
+            targetService           : the service name of the target endpoint
+            targetEndpoint          : the endpoint name of the target endpoint
+            targetInterfaceName     : the interface name of the target endpoint
+            busCfg                  : the Spring configuration file used for CXF bus initialization
+            mtomEnabled             : enable MTOM/attachment support
+            synchronous             : specifies if the endpoint expects send message exchange by sendSync method
+            useJBIWrapper           : specifies if the endpoint expects messages to use the JBI wrapper for SOAP messages
+            useSOAPEnvelope         : specifies if the endpoint expects SOAP messages when useJBIWrapper is false
+            locationURI             : specifies the HTTP address to which requests are sent. This value will override any value specified in the WSDL.
+            timeout                 : specifies the interval for which the endpoint will wait for a response. This is specified in seconds.
+            x509                    : specifies if the endpoint uses X.509 Certificate to do the authentication. By default, the Authorization and Anthentication
+                                      is delegated to ServiceMix JAASAuthenticationService with WS-Security UsernameToken. If this flag is set to true,
+                                      X.509 Certificate is checked to run authentication.
+            delegateToJaas          : specifies if the endpoint delegates to JAASAuthenticationService to do the authentication (true by default).
+            schemaValidationEnabled : specifies if the endpoint use schema validation for the incoming/outgoing message.
+            properties              : sets arbitrary properties that are added to the CXF context at the endpoint level.                                      
+    -->
+
     <!-- BEGIN SNIPPET: cxfbc-consumer -->
+    
 	<cxfbc:consumer wsdl="classpath:service.wsdl"
 		targetEndpoint="replaceMe:targetEndpoint" 
 		targetService="replaceMe:targetService"
 		targetInterface="replaceMe:targetInterface" />
     <!-- END SNIPPET: cxfbc-consumer -->
     
+    <!-- == PROVIDER ENDPOINT == -->
+    
+    <!-- 
+        A provider endpoint is a client side JBI endpoint which can receive requests from the NMR and send
+        them to a given URL where the service is provided.
+        
+        Attributes:
+            wsdl                    : the WSDL will be retrieved from the given location
+            service                 : the service name of the exposed endpoint
+            endpoint                : the endpoint name of the exposed endpoint
+            interfaceName           : the interface name of the exposed endpoint
+            locationURI             : the HTTP URL of the target service (external)
+            bugCfg                  : the Spring configuration file used for CXF bus initialization
+            mtomEnabled             : enable MTOM/attachment support
+            useJBIWrapper           : specifies if the endpoint expects messages to use the JBI wrapper for SOAP messages
+            useSOAPEnvelope         : specifies if the endpoint expects SOAP messages when useJBIWrapper is false
+            schemaValidationEnabled : specifies if the endpoint use schema validation for the incoming/outgoing message
+            properties              : sets arbitrary properties that are added to the CXF content at endpoint level
+    -->
+    
     <!-- BEGIN SNIPPET: cxfbc-provider -->
     <cxfbc:provider wsdl="classpath:service.wsdl"
         locationURI="http://host:port/service"