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/07/05 13:46:52 UTC

svn commit: r960562 - in /servicemix/components/engines/servicemix-pdf/trunk: ./ src/main/java/org/apache/servicemix/pdf/ src/main/java/org/apache/servicemix/pdf/marshaler/ src/main/java/org/apache/servicemix/pdfcomposer/marshaler/ src/main/resources/ ...

Author: jbonofre
Date: Mon Jul  5 11:46:51 2010
New Revision: 960562

URL: http://svn.apache.org/viewvc?rev=960562&view=rev
Log:
Change the component package/name.

Added:
    servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/
    servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/PdfComponent.java
      - copied, changed from r960557, servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdfcomposer/PdfComposerComponent.java
    servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/PdfComposerEndpoint.java
      - copied, changed from r960557, servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdfcomposer/PdfComposerEndpoint.java
    servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/
      - copied from r960557, servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdfcomposer/marshaler/
    servicemix/components/engines/servicemix-pdf/trunk/src/main/resources/META-INF/spring/servicemix-pdf.xml
      - copied, changed from r960557, servicemix/components/engines/servicemix-pdf/trunk/src/main/resources/META-INF/spring/servicemix-pdfcomposer.xml
    servicemix/components/engines/servicemix-pdf/trunk/src/main/resources/servicemix-pdf-composer.wsdl
      - copied unchanged from r960557, servicemix/components/engines/servicemix-pdf/trunk/src/main/resources/servicemix-pdfcomposer.wsdl
    servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdf/
    servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdf/PdfComposerEndpointTest.java
      - copied, changed from r960557, servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdfcomposer/PdfComposerEndpointTest.java
    servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdf/marshaler/
      - copied from r960557, servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdfcomposer/marshaler/
Removed:
    servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdfcomposer/marshaler/
    servicemix/components/engines/servicemix-pdf/trunk/src/main/resources/META-INF/spring/servicemix-pdfcomposer.xml
    servicemix/components/engines/servicemix-pdf/trunk/src/main/resources/servicemix-pdfcomposer.wsdl
    servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdfcomposer/marshaler/
Modified:
    servicemix/components/engines/servicemix-pdf/trunk/pom.xml
    servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/JaxbPdfComposerMarshaler.java
    servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/PdfComposerDataField.java
    servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/PdfComposerMarshalerSupport.java
    servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/PdfComposerRequest.java
    servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/XpathPdfComposerMarshaler.java
    servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdf/marshaler/DefaultPdfComposerMarshalerTest.java
    servicemix/components/engines/servicemix-pdf/trunk/src/test/resources/xbean/xbean.xml

Modified: servicemix/components/engines/servicemix-pdf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-pdf/trunk/pom.xml?rev=960562&r1=960561&r2=960562&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-pdf/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-pdf/trunk/pom.xml Mon Jul  5 11:46:51 2010
@@ -27,20 +27,21 @@
     </parent>
     
     <groupId>org.apache.servicemix</groupId>
-    <artifactId>servicemix-pdfcomposer</artifactId>
+    <artifactId>servicemix-pdf</artifactId>
     <version>2010.02-SNAPSHOT</version>
     <packaging>jbi-component</packaging>
     
-    <name>ServiceMix :: PDF Composer</name>
+    <name>ServiceMix :: PDF</name>
     <description>
-        A service engine generating PDF documents using incoming messages and PDF templates. It uses iText library.
+        A service engine manipulating PDF documents: composing PDF documents using incoming messages and PDF templates, reading data in a PDF document, writing data into a PDF document.
+         It uses iText library.
     </description>
     
     <properties>
         <itext.version>2.1.7</itext.version>
         <jdom.version>1.0</jdom.version>
         <servicemix.osgi.import>
-            !org.apache.servicemix.pdfcomposer*,
+            !org.apache.servicemix.pdf*,
             org.apache.servicemix.common,
             org.apache.servicemix.common.osgi,
             org.apache.servicemix.executors.impl,
@@ -55,8 +56,8 @@
             *
         </servicemix.osgi.import>
         <servicemix.osgi.export>
-            org.apache.servicemix.pdfcomposer*;version=${project.version},
-            META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.pdfcomposer
+            org.apache.servicemix.pdf*;version=${project.version},
+            META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.pdf
         </servicemix.osgi.export>
         <servicemix.osgi.bundles>
             org.springframework.core,
@@ -66,9 +67,9 @@
     </properties>
     
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/servicemix/components/engines/servicemix-pdfcomposer/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/servicemix/components/engines/servicemix-pdfcomposer/trunk</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/servicemix/components/engines/servicemix-pdfcomposer/trunk</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/servicemix/components/engines/servicemix-pdf/trunk</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/servicemix/components/engines/servicemix-pdf/trunk</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/servicemix/components/engines/servicemix-pdf/trunk</url>
     </scm>
     
     <dependencies>
@@ -135,7 +136,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <type>service-engine</type>
-                    <component>org.apache.servicemix.pdfcomposer.PdfComposerComponent</component>
+                    <component>org.apache.servicemix.pdf.PdfComponent</component>
                 </configuration>
             </plugin>
             <plugin>
@@ -147,7 +148,7 @@
                             <goal>mapping</goal>
                         </goals>
                         <configuration>
-                            <namespace>http://servicemix.apache.org/pdfcomposer/1.0</namespace>
+                            <namespace>http://servicemix.apache.org/pdf/1.0</namespace>
                         </configuration>
                     </execution>
                 </executions>

Copied: servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/PdfComponent.java (from r960557, servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdfcomposer/PdfComposerComponent.java)
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/PdfComponent.java?p2=servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/PdfComponent.java&p1=servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdfcomposer/PdfComposerComponent.java&r1=960557&r2=960562&rev=960562&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdfcomposer/PdfComposerComponent.java (original)
+++ servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/PdfComponent.java Mon Jul  5 11:46:51 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.pdfcomposer;
+package org.apache.servicemix.pdf;
 
 import java.util.List;
 
@@ -22,13 +22,13 @@ import org.apache.servicemix.common.Defa
 
 /**
  * <p>
- * A JBI component which generated PDF documents populating fields in a PDF template using incoming messages.
+ * A JBI component which manipulate PDF documents.
  * </p>
  * 
  * @author jbonofre
- * @org.apache.xbean.XBean element="component" description="PDFComposer Component"
+ * @org.apache.xbean.XBean element="component" description="PDF Component"
  */
-public class PdfComposerComponent extends DefaultComponent {
+public class PdfComponent extends DefaultComponent {
     
     private PdfComposerEndpoint[] endpoints;
     

Copied: servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/PdfComposerEndpoint.java (from r960557, servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdfcomposer/PdfComposerEndpoint.java)
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/PdfComposerEndpoint.java?p2=servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/PdfComposerEndpoint.java&p1=servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdfcomposer/PdfComposerEndpoint.java&r1=960557&r2=960562&rev=960562&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdfcomposer/PdfComposerEndpoint.java (original)
+++ servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/PdfComposerEndpoint.java Mon Jul  5 11:46:51 2010
@@ -14,10 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.pdfcomposer;
+package org.apache.servicemix.pdf;
 
 import java.io.FileOutputStream;
-import java.io.InputStream;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 
@@ -32,10 +31,10 @@ import javax.xml.namespace.QName;
 import javax.xml.transform.stream.StreamSource;
 
 import org.apache.servicemix.common.endpoints.ProviderEndpoint;
-import org.apache.servicemix.pdfcomposer.marshaler.JaxbPdfComposerMarshaler;
-import org.apache.servicemix.pdfcomposer.marshaler.PdfComposerDataField;
-import org.apache.servicemix.pdfcomposer.marshaler.PdfComposerMarshalerSupport;
-import org.apache.servicemix.pdfcomposer.marshaler.PdfComposerRequest;
+import org.apache.servicemix.pdf.marshaler.JaxbPdfComposerMarshaler;
+import org.apache.servicemix.pdf.marshaler.PdfComposerDataField;
+import org.apache.servicemix.pdf.marshaler.PdfComposerMarshalerSupport;
+import org.apache.servicemix.pdf.marshaler.PdfComposerRequest;
 import org.apache.servicemix.soap.util.DomUtil;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
@@ -46,15 +45,15 @@ import com.lowagie.text.pdf.PdfStamper;
 
 /**
  * <p>
- * Represents a PDFComposer endpoint.
+ * Represents a PDF Composer endpoint.
  * </p>
  * 
  * @author jbonofre
- * @org.apache.xbean.XBean element="endpoint"
+ * @org.apache.xbean.XBean element="composer"
  */
 public class PdfComposerEndpoint extends ProviderEndpoint {
     
-    public final static String DEFAULT_WSDL = "servicemix-pdfcomposer.wsdl"; // the default abstract WSDL
+    public final static String DEFAULT_WSDL = "servicemix-pdf-composer.wsdl"; // the default abstract WSDL
     
     private String template; // the template can be static (define in the endpoint descriptor) or provided in the "in" message
     private String templatesDir = "."; // the location where to looking for template files

Modified: servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/JaxbPdfComposerMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/JaxbPdfComposerMarshaler.java?rev=960562&r1=960557&r2=960562&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/JaxbPdfComposerMarshaler.java (original)
+++ servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/JaxbPdfComposerMarshaler.java Mon Jul  5 11:46:51 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.pdfcomposer.marshaler;
+package org.apache.servicemix.pdf.marshaler;
 
 import javax.jbi.messaging.NormalizedMessage;
 import javax.xml.bind.JAXBContext;

Modified: servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/PdfComposerDataField.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/PdfComposerDataField.java?rev=960562&r1=960557&r2=960562&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/PdfComposerDataField.java (original)
+++ servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/PdfComposerDataField.java Mon Jul  5 11:46:51 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.pdfcomposer.marshaler;
+package org.apache.servicemix.pdf.marshaler;
 
 import javax.xml.bind.annotation.XmlAttribute;
 

Modified: servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/PdfComposerMarshalerSupport.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/PdfComposerMarshalerSupport.java?rev=960562&r1=960557&r2=960562&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/PdfComposerMarshalerSupport.java (original)
+++ servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/PdfComposerMarshalerSupport.java Mon Jul  5 11:46:51 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.pdfcomposer.marshaler;
+package org.apache.servicemix.pdf.marshaler;
 
 import javax.jbi.messaging.NormalizedMessage;
 

Modified: servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/PdfComposerRequest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/PdfComposerRequest.java?rev=960562&r1=960557&r2=960562&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/PdfComposerRequest.java (original)
+++ servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/PdfComposerRequest.java Mon Jul  5 11:46:51 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.pdfcomposer.marshaler;
+package org.apache.servicemix.pdf.marshaler;
 
 import java.util.List;
 

Modified: servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/XpathPdfComposerMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/XpathPdfComposerMarshaler.java?rev=960562&r1=960557&r2=960562&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/XpathPdfComposerMarshaler.java (original)
+++ servicemix/components/engines/servicemix-pdf/trunk/src/main/java/org/apache/servicemix/pdf/marshaler/XpathPdfComposerMarshaler.java Mon Jul  5 11:46:51 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.pdfcomposer.marshaler;
+package org.apache.servicemix.pdf.marshaler;
 
 import javax.jbi.messaging.NormalizedMessage;
 

Copied: servicemix/components/engines/servicemix-pdf/trunk/src/main/resources/META-INF/spring/servicemix-pdf.xml (from r960557, servicemix/components/engines/servicemix-pdf/trunk/src/main/resources/META-INF/spring/servicemix-pdfcomposer.xml)
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-pdf/trunk/src/main/resources/META-INF/spring/servicemix-pdf.xml?p2=servicemix/components/engines/servicemix-pdf/trunk/src/main/resources/META-INF/spring/servicemix-pdf.xml&p1=servicemix/components/engines/servicemix-pdf/trunk/src/main/resources/META-INF/spring/servicemix-pdfcomposer.xml&r1=960557&r2=960562&rev=960562&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-pdf/trunk/src/main/resources/META-INF/spring/servicemix-pdfcomposer.xml (original)
+++ servicemix/components/engines/servicemix-pdf/trunk/src/main/resources/META-INF/spring/servicemix-pdf.xml Mon Jul  5 11:46:51 2010
@@ -35,7 +35,7 @@
   http://www.springframework.org/schema/osgi-compendium
   http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
   
-    <bean id="servicemix-pdfcomposer" class="org.apache.servicemix.pdfcomposer.PdfComposerComponent">
+    <bean id="servicemix-pdf" class="org.apache.servicemix.pdf.PdfComponent">
         <property name="executorFactory" ref="executorFactory"/>
     </bean>
     
@@ -50,7 +50,7 @@
     </bean>
     
     <bean id="endpoint-tracker" class="org.apache.servicemix.common.osgi.EndpointTracker">
-        <property name="component" ref="servicemix-pdfcomposer"/>
+        <property name="component" ref="servicemix-pdf"/>
     </bean>
     
     <osgi:list id="endpoints"
@@ -59,30 +59,14 @@
         <osgi:listener ref="endpoint-tracker" bind-method="register" unbind-method="unregister"/>           
     </osgi:list>
     
-    <osgi:service ref="servicemix-pdfcomposer" interface="javax.jbi.component.Component">
+    <osgi:service ref="servicemix-pdf" interface="javax.jbi.component.Component">
         <osgi:service-properties>
-            <entry key="NAME" value="servicemix-pdfcomposer"/>
+            <entry key="NAME" value="servicemix-pdf"/>
             <entry key="TYPE" value="service-engine"/>
         </osgi:service-properties>
     </osgi:service>
     
-    rty name="component" ref="servicemix-exec"/>
-    </bean>
-    
-    <osgi:list id="endpoints"
-               interface="org.apache.servicemix.common.osgi.EndpointWrapper"
-               cardinality="0..N">
-        <osgi:listener ref="endpoint-tracker" bind-method="register" unbind-method="unregister"/>
-    </osgi:list>
-    
-    <osgi:service ref="servicemix-exec" interface="javax.jbi.component.Component">
-        <osgi:service-properties>
-            <entry key="NAME" value="servicemix-exec"/>
-            <entry key="TYPE" value="service-engine"/>
-        </osgi:service-properties>
-    </osgi:service>
-    
-    <osgix:cm-properties id="cmProps" persistent-id="org.apache.servicemix.components.exec">
+    <osgix:cm-properties id="cmProps" persistent-id="org.apache.servicemix.components.pdf">
         <prop key="threadPoolCorePoolSize">8</prop>
         <prop key="threadPoolMaximumPoolSize">32</prop>
         <prop key="threadPoolQueueSize">256</prop>

Copied: servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdf/PdfComposerEndpointTest.java (from r960557, servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdfcomposer/PdfComposerEndpointTest.java)
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdf/PdfComposerEndpointTest.java?p2=servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdf/PdfComposerEndpointTest.java&p1=servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdfcomposer/PdfComposerEndpointTest.java&r1=960557&r2=960562&rev=960562&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdfcomposer/PdfComposerEndpointTest.java (original)
+++ servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdf/PdfComposerEndpointTest.java Mon Jul  5 11:46:51 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.pdfcomposer;
+package org.apache.servicemix.pdf;
 
 import java.io.File;
 import java.net.URI;
@@ -23,6 +23,7 @@ import java.net.URL;
 import javax.xml.namespace.QName;
 
 import org.apache.servicemix.jbi.container.JBIContainer;
+import org.apache.servicemix.pdf.PdfComponent;
 
 import junit.framework.TestCase;
 
@@ -49,8 +50,8 @@ public class PdfComposerEndpointTest ext
         container.setEmbedded(true);
         container.init();
         // deploy the pdfcomposer component
-        PdfComposerComponent component = new PdfComposerComponent();
-        container.activateComponent(component, "PdfComposerComponent");
+        PdfComponent component = new PdfComponent();
+        container.activateComponent(component, "PdfComponent");
         // start the JBI container
         container.start();
         // deploy a PdfComposer SU

Modified: servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdf/marshaler/DefaultPdfComposerMarshalerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdf/marshaler/DefaultPdfComposerMarshalerTest.java?rev=960562&r1=960557&r2=960562&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdf/marshaler/DefaultPdfComposerMarshalerTest.java (original)
+++ servicemix/components/engines/servicemix-pdf/trunk/src/test/java/org/apache/servicemix/pdf/marshaler/DefaultPdfComposerMarshalerTest.java Mon Jul  5 11:46:51 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix.pdfcomposer.marshaler;
+package org.apache.servicemix.pdf.marshaler;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -26,6 +26,10 @@ import org.apache.servicemix.id.IdGenera
 import org.apache.servicemix.jbi.helper.MessageExchangePattern;
 import org.apache.servicemix.jbi.jaxp.StringSource;
 import org.apache.servicemix.jbi.messaging.MessageExchangeFactoryImpl;
+import org.apache.servicemix.pdf.marshaler.JaxbPdfComposerMarshaler;
+import org.apache.servicemix.pdf.marshaler.PdfComposerDataField;
+import org.apache.servicemix.pdf.marshaler.PdfComposerMarshalerSupport;
+import org.apache.servicemix.pdf.marshaler.PdfComposerRequest;
 
 import junit.framework.TestCase;
 

Modified: servicemix/components/engines/servicemix-pdf/trunk/src/test/resources/xbean/xbean.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-pdf/trunk/src/test/resources/xbean/xbean.xml?rev=960562&r1=960561&r2=960562&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-pdf/trunk/src/test/resources/xbean/xbean.xml (original)
+++ servicemix/components/engines/servicemix-pdf/trunk/src/test/resources/xbean/xbean.xml Mon Jul  5 11:46:51 2010
@@ -17,10 +17,10 @@
     limitations under the License.
 
 -->
-<beans xmlns:pdfcomposer="http://servicemix.apache.org/pdfcomposer/1.0"
+<beans xmlns:pdf="http://servicemix.apache.org/pdf/1.0"
        xmlns:test="http://test">
 
-    <pdfcomposer:endpoint service="test:service"
+    <pdf:composer service="test:service"
                           endpoint="pdfcomposer"/>
        
 </beans>
\ No newline at end of file