You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ch...@apache.org on 2006/02/22 00:40:29 UTC

svn commit: r379627 [27/34] - in /incubator/servicemix/trunk: ./ etc/ sandbox/servicemix-wsn-1.2/src/sa/META-INF/ sandbox/servicemix-wsn-1.2/src/su/META-INF/ servicemix-assembly/ servicemix-assembly/src/main/assembly/ servicemix-assembly/src/main/relea...

Modified: incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateInstallerMojo.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateInstallerMojo.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateInstallerMojo.java (original)
+++ incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateInstallerMojo.java Tue Feb 21 15:40:05 2006
@@ -1,162 +1,162 @@
-/*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed 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 org.apache.servicemix.maven.plugin.jbi;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.apache.maven.archiver.MavenArchiveConfiguration;
-import org.apache.maven.archiver.MavenArchiver;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.DependencyResolutionRequiredException;
-import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.jar.JarArchiver;
-import org.codehaus.plexus.archiver.jar.ManifestException;
-import org.codehaus.plexus.util.FileUtils;
-
-/**
- * A Mojo used to build the jbi component installer file.
- *
- * @author <a href="gnodet@apache.org">Guillaume Nodet</a>
- * @version $Id: GenerateApplicationXmlMojo.java 314956 2005-10-12 16:27:15Z brett $
- * @goal jbi-component
- * @phase package
- * @requiresDependencyResolution runtime
- * @description generates the component installer
- */
-public class GenerateInstallerMojo extends AbstractJbiMojo {
-
-    /**
-     * The directory for the generated WAR.
-     *
-     * @parameter expression="${project.build.directory}"
-     * @required
-     */
-    private File outputDirectory;
-
-    /**
-     * The name of the generated war.
-     *
-     * @parameter expression="${project.artifactId}-${project.version}-installer.zip"
-     * @required
-     */
-    private String installerName;
-    
-    /**
-     * The Zip archiver.
-     *
-     * @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
-     * @required
-     */
-    private JarArchiver jarArchiver;
-
-    /**
-     * The maven archive configuration to use.
-     *
-     * @parameter
-     */
-    private MavenArchiveConfiguration archive = new MavenArchiveConfiguration();
-
-
-	public void execute() throws MojoExecutionException, MojoFailureException {
-		
-        getLog().debug( " ======= GenerateInstallerMojo settings =======" );
-        getLog().debug( "workDirectory[" + workDirectory + "]" );
-        getLog().debug( "installerName[" + installerName + "]" );
-        
-        try {
-        	
-			createUnpackedInstaller();
-			
-			File installerFile = new File(outputDirectory, installerName);
-			createArchive(installerFile);
-			
-			projectHelper.attachArtifact(project, "zip", "installer", new File(outputDirectory, installerName));
-			
-		} catch (JbiPluginException e) {
-            throw new MojoExecutionException( "Failed to create installer", e );
-		}
-	}
-
-	private void createArchive(File installerFile) throws JbiPluginException {
-		try {
-			
-	        //generate war file
-	        getLog().info( "Generating installer " + installerFile.getAbsolutePath() );
-	        MavenArchiver archiver = new MavenArchiver();
-	        archiver.setArchiver( jarArchiver );
-	        archiver.setOutputFile( installerFile );
-			jarArchiver.addDirectory( workDirectory );
-			// create archive
-			archiver.createArchive( getProject(), archive );
-			
-		} catch (ArchiverException e) {
-			throw new JbiPluginException("Error creating assembly: " + e.getMessage(), e);
-		} catch (ManifestException e) {
-			throw new JbiPluginException("Error creating assembly: " + e.getMessage(), e);
-		} catch (IOException e) {
-			throw new JbiPluginException("Error creating assembly: " + e.getMessage(), e);
-		} catch (DependencyResolutionRequiredException e) {
-			throw new JbiPluginException("Error creating assembly: " + e.getMessage(), e);
-		}
-
-	}
-
-	private void createUnpackedInstaller() throws JbiPluginException {
-
-		if (!workDirectory.isDirectory()) {
-			if (!workDirectory.mkdirs()) {
-				throw new JbiPluginException("Unable to create work directory: " + workDirectory);
-			}
-		}
-
-        File projectArtifact = new File(outputDirectory, project.getArtifactId() + "-" + project.getVersion() + ".jar");
-    	try {
-        	FileUtils.copyFileToDirectory( projectArtifact,
-        								   workDirectory);
-    	} catch (IOException e) {
-    		throw new JbiPluginException("Unable to copy file " + projectArtifact, e);
-    	}
-		
-        Set artifacts = project.getArtifacts();
-        for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
-        {
-            Artifact artifact = (Artifact) iter.next();
-
-            // TODO: utilise appropriate methods from project builder
-            ScopeArtifactFilter filter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME );
-            if ( !artifact.isOptional() && filter.include( artifact ) )
-            {
-                String type = artifact.getType();
-                if ( "jar".equals( type ) )
-                {
-                	try {
-	                	FileUtils.copyFileToDirectory( artifact.getFile(),
-	                								   new File(workDirectory, LIB_DIRECTORY));
-                	} catch (IOException e) {
-                		throw new JbiPluginException("Unable to copy file " + artifact.getFile(), e);
-                	}
-                }
-            }
-        }
-	}
-
-}
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed 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 org.apache.servicemix.maven.plugin.jbi;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.apache.maven.archiver.MavenArchiveConfiguration;
+import org.apache.maven.archiver.MavenArchiver;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
+import org.codehaus.plexus.archiver.jar.ManifestException;
+import org.codehaus.plexus.util.FileUtils;
+
+/**
+ * A Mojo used to build the jbi component installer file.
+ *
+ * @author <a href="gnodet@apache.org">Guillaume Nodet</a>
+ * @version $Id: GenerateApplicationXmlMojo.java 314956 2005-10-12 16:27:15Z brett $
+ * @goal jbi-component
+ * @phase package
+ * @requiresDependencyResolution runtime
+ * @description generates the component installer
+ */
+public class GenerateInstallerMojo extends AbstractJbiMojo {
+
+    /**
+     * The directory for the generated WAR.
+     *
+     * @parameter expression="${project.build.directory}"
+     * @required
+     */
+    private File outputDirectory;
+
+    /**
+     * The name of the generated war.
+     *
+     * @parameter expression="${project.artifactId}-${project.version}-installer.zip"
+     * @required
+     */
+    private String installerName;
+    
+    /**
+     * The Zip archiver.
+     *
+     * @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
+     * @required
+     */
+    private JarArchiver jarArchiver;
+
+    /**
+     * The maven archive configuration to use.
+     *
+     * @parameter
+     */
+    private MavenArchiveConfiguration archive = new MavenArchiveConfiguration();
+
+
+	public void execute() throws MojoExecutionException, MojoFailureException {
+		
+        getLog().debug( " ======= GenerateInstallerMojo settings =======" );
+        getLog().debug( "workDirectory[" + workDirectory + "]" );
+        getLog().debug( "installerName[" + installerName + "]" );
+        
+        try {
+        	
+			createUnpackedInstaller();
+			
+			File installerFile = new File(outputDirectory, installerName);
+			createArchive(installerFile);
+			
+			projectHelper.attachArtifact(project, "zip", "installer", new File(outputDirectory, installerName));
+			
+		} catch (JbiPluginException e) {
+            throw new MojoExecutionException( "Failed to create installer", e );
+		}
+	}
+
+	private void createArchive(File installerFile) throws JbiPluginException {
+		try {
+			
+	        //generate war file
+	        getLog().info( "Generating installer " + installerFile.getAbsolutePath() );
+	        MavenArchiver archiver = new MavenArchiver();
+	        archiver.setArchiver( jarArchiver );
+	        archiver.setOutputFile( installerFile );
+			jarArchiver.addDirectory( workDirectory );
+			// create archive
+			archiver.createArchive( getProject(), archive );
+			
+		} catch (ArchiverException e) {
+			throw new JbiPluginException("Error creating assembly: " + e.getMessage(), e);
+		} catch (ManifestException e) {
+			throw new JbiPluginException("Error creating assembly: " + e.getMessage(), e);
+		} catch (IOException e) {
+			throw new JbiPluginException("Error creating assembly: " + e.getMessage(), e);
+		} catch (DependencyResolutionRequiredException e) {
+			throw new JbiPluginException("Error creating assembly: " + e.getMessage(), e);
+		}
+
+	}
+
+	private void createUnpackedInstaller() throws JbiPluginException {
+
+		if (!workDirectory.isDirectory()) {
+			if (!workDirectory.mkdirs()) {
+				throw new JbiPluginException("Unable to create work directory: " + workDirectory);
+			}
+		}
+
+        File projectArtifact = new File(outputDirectory, project.getArtifactId() + "-" + project.getVersion() + ".jar");
+    	try {
+        	FileUtils.copyFileToDirectory( projectArtifact,
+        								   workDirectory);
+    	} catch (IOException e) {
+    		throw new JbiPluginException("Unable to copy file " + projectArtifact, e);
+    	}
+		
+        Set artifacts = project.getArtifacts();
+        for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
+        {
+            Artifact artifact = (Artifact) iter.next();
+
+            // TODO: utilise appropriate methods from project builder
+            ScopeArtifactFilter filter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME );
+            if ( !artifact.isOptional() && filter.include( artifact ) )
+            {
+                String type = artifact.getType();
+                if ( "jar".equals( type ) )
+                {
+                	try {
+	                	FileUtils.copyFileToDirectory( artifact.getFile(),
+	                								   new File(workDirectory, LIB_DIRECTORY));
+                	} catch (IOException e) {
+                		throw new JbiPluginException("Unable to copy file " + artifact.getFile(), e);
+                	}
+                }
+            }
+        }
+	}
+
+}

Propchange: incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateInstallerMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java (original)
+++ incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java Tue Feb 21 15:40:05 2006
@@ -1,108 +1,108 @@
-/*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed 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 org.apache.servicemix.maven.plugin.jbi;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-
-import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
-import org.codehaus.plexus.util.xml.XMLWriter;
-
-public class JbiComponentDescriptorWriter {
-
-	private final String encoding;
-
-	public JbiComponentDescriptorWriter(String encoding) {
-		this.encoding = encoding;
-	}
-
-	public void write(File descriptor, 
-					  String component, 
-					  String bootstrap, 
-					  String type,
-					  String name,
-					  String description,
-					  List uris)
-			throws JbiPluginException {
-		FileWriter w;
-		try {
-			w = new FileWriter(descriptor);
-		} catch (IOException ex) {
-			throw new JbiPluginException("Exception while opening file["
-					+ descriptor.getAbsolutePath() + "]", ex);
-		}
-
-		XMLWriter writer = new PrettyPrintXMLWriter(w, encoding, null);
-		writer.startElement("jbi");
-		writer.addAttribute("xmlns", "http://java.sun.com/xml/ns/jbi");
-		writer.addAttribute("version", "1.0");
-
-		writer.startElement("component");
-		writer.addAttribute("type", type);
-		
-		writer.startElement("identification");
-		writer.startElement("name");
-		writer.writeText(name);
-		writer.endElement();
-		writer.startElement("description");
-		writer.writeText(description);
-		writer.endElement();
-		writer.endElement();
-		
-		writer.startElement("component-class-name");
-		writer.writeText(component);
-		writer.endElement();
-		writer.startElement("component-class-path");
-		for (Iterator it = uris.iterator(); it.hasNext();) {
-			writer.startElement("path-element");
-			writer.writeText(it.next().toString());
-			writer.endElement();
-		}
-		writer.endElement();
-
-		writer.startElement("bootstrap-class-name");
-		writer.writeText(bootstrap);
-		writer.endElement();
-		writer.startElement("bootstrap-class-path");
-		for (Iterator it = uris.iterator(); it.hasNext();) {
-			writer.startElement("path-element");
-			writer.writeText(it.next().toString());
-			writer.endElement();
-		}
-		writer.endElement();
-		
-		writer.endElement();
-		
-		writer.endElement();
-
-		close(w);
-	}
-	
-	private void close(Writer closeable) {
-		if (closeable != null) {
-			try {
-				closeable.close();
-			} catch (Exception e) {
-				// TODO: warn
-			}
-		}
-	}
-
-}
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed 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 org.apache.servicemix.maven.plugin.jbi;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Iterator;
+import java.util.List;
+
+import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
+import org.codehaus.plexus.util.xml.XMLWriter;
+
+public class JbiComponentDescriptorWriter {
+
+	private final String encoding;
+
+	public JbiComponentDescriptorWriter(String encoding) {
+		this.encoding = encoding;
+	}
+
+	public void write(File descriptor, 
+					  String component, 
+					  String bootstrap, 
+					  String type,
+					  String name,
+					  String description,
+					  List uris)
+			throws JbiPluginException {
+		FileWriter w;
+		try {
+			w = new FileWriter(descriptor);
+		} catch (IOException ex) {
+			throw new JbiPluginException("Exception while opening file["
+					+ descriptor.getAbsolutePath() + "]", ex);
+		}
+
+		XMLWriter writer = new PrettyPrintXMLWriter(w, encoding, null);
+		writer.startElement("jbi");
+		writer.addAttribute("xmlns", "http://java.sun.com/xml/ns/jbi");
+		writer.addAttribute("version", "1.0");
+
+		writer.startElement("component");
+		writer.addAttribute("type", type);
+		
+		writer.startElement("identification");
+		writer.startElement("name");
+		writer.writeText(name);
+		writer.endElement();
+		writer.startElement("description");
+		writer.writeText(description);
+		writer.endElement();
+		writer.endElement();
+		
+		writer.startElement("component-class-name");
+		writer.writeText(component);
+		writer.endElement();
+		writer.startElement("component-class-path");
+		for (Iterator it = uris.iterator(); it.hasNext();) {
+			writer.startElement("path-element");
+			writer.writeText(it.next().toString());
+			writer.endElement();
+		}
+		writer.endElement();
+
+		writer.startElement("bootstrap-class-name");
+		writer.writeText(bootstrap);
+		writer.endElement();
+		writer.startElement("bootstrap-class-path");
+		for (Iterator it = uris.iterator(); it.hasNext();) {
+			writer.startElement("path-element");
+			writer.writeText(it.next().toString());
+			writer.endElement();
+		}
+		writer.endElement();
+		
+		writer.endElement();
+		
+		writer.endElement();
+
+		close(w);
+	}
+	
+	private void close(Writer closeable) {
+		if (closeable != null) {
+			try {
+				closeable.close();
+			} catch (Exception e) {
+				// TODO: warn
+			}
+		}
+	}
+
+}

Propchange: incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiPluginException.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiPluginException.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiPluginException.java (original)
+++ incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiPluginException.java Tue Feb 21 15:40:05 2006
@@ -1,21 +1,21 @@
-package org.apache.servicemix.maven.plugin.jbi;
-
-public class JbiPluginException extends Exception {
-
-	public JbiPluginException() {
-		super();
-	}
-
-	public JbiPluginException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-	public JbiPluginException(String message) {
-		super(message);
-	}
-
-	public JbiPluginException(Throwable cause) {
-		super(cause);
-	}
-
-}
+package org.apache.servicemix.maven.plugin.jbi;
+
+public class JbiPluginException extends Exception {
+
+	public JbiPluginException() {
+		super();
+	}
+
+	public JbiPluginException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public JbiPluginException(String message) {
+		super(message);
+	}
+
+	public JbiPluginException(Throwable cause) {
+		super(cause);
+	}
+
+}

Propchange: incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiPluginException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/resources/META-INF/DISCLAIMER.txt
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/resources/META-INF/DISCLAIMER.txt?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/resources/META-INF/DISCLAIMER.txt (original)
+++ incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/resources/META-INF/DISCLAIMER.txt Tue Feb 21 15:40:05 2006
@@ -1,7 +1,7 @@
-ActiveMQ is an effort undergoing incubation at the Apache Software Foundation
-(ASF), sponsored by the Geronimo PMC. Incubation is required of all newly
-accepted projects until a further review indicates that the infrastructure,
-communications, and decision making process have stabilized in a manner
-consistent with other successful ASF projects. While incubation status is not
-necessarily a reflection of the completeness or stability of the code, it does
+ActiveMQ is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Geronimo PMC. Incubation is required of all newly
+accepted projects until a further review indicates that the infrastructure,
+communications, and decision making process have stabilized in a manner
+consistent with other successful ASF projects. While incubation status is not
+necessarily a reflection of the completeness or stability of the code, it does
 indicate that the project has yet to be fully endorsed by the ASF.

Propchange: incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/resources/META-INF/DISCLAIMER.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/resources/META-INF/plexus/components.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/resources/META-INF/plexus/components.xml Tue Feb 21 15:40:05 2006
@@ -1,41 +1,41 @@
-<component-set>
-  <components>
-    <!--component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>jar</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>jar</type>
-        <extension>jar</extension>
-      </configuration>
-    </component-->
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>jbi-component</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>jbi-component</type>
-        <extension>jar</extension>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-      <role-hint>jbi-component</role-hint>
-      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
-      <configuration>
-        <phases>
-          <generate-resources>org.apache.servicemix.plugins:maven2-jbi-plugin:generate-jbi-descriptor</generate-resources>
-          <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
-          <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
-          <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
-          <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
-          <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
-          <package>org.apache.maven.plugins:maven-jar-plugin:jar,
-                   org.apache.servicemix.plugins:maven2-jbi-plugin:jbi-component</package>
-          <install>org.apache.maven.plugins:maven-install-plugin:install</install>
-          <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
-        </phases>
-      </configuration>
-    </component>
-  </components>
-</component-set>
+<component-set>
+  <components>
+    <!--component>
+      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+      <role-hint>jar</role-hint>
+      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+      <configuration>
+        <type>jar</type>
+        <extension>jar</extension>
+      </configuration>
+    </component-->
+    <component>
+      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+      <role-hint>jbi-component</role-hint>
+      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+      <configuration>
+        <type>jbi-component</type>
+        <extension>jar</extension>
+      </configuration>
+    </component>
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>jbi-component</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <phases>
+          <generate-resources>org.apache.servicemix.plugins:maven2-jbi-plugin:generate-jbi-descriptor</generate-resources>
+          <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+          <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+          <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+          <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+          <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+          <package>org.apache.maven.plugins:maven-jar-plugin:jar,
+                   org.apache.servicemix.plugins:maven2-jbi-plugin:jbi-component</package>
+          <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+          <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+        </phases>
+      </configuration>
+    </component>
+  </components>
+</component-set>

Propchange: incubator/servicemix/trunk/tooling/maven2-jbi-plugin/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/maven.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/maven.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/maven.xml Tue Feb 21 15:40:05 2006
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-	
-	Copyright 2005 The Apache Software Foundation
-	
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
--->
-
-<project xmlns:ant="jelly:ant"
-	xmlns:artifact="artifact">
-
-	<!-- redefined "build" goal from parent pom -->
-	<preGoal name="java:compile">
-		<echo message="Compiling the JBI descriptor schema..." />
-		<mkdir dir="${basedir}/target/generated" />
-		<taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask"
-			fork="true">
-			<classpath refid="maven.dependency.classpath" />
-		</taskdef>
-		<xjc schema="${basedir}/src/main/resources/jbi.xsd"
-			package="org.apache.servicemix.descriptors.jbi"
-			destdir="${basedir}/target/generated" />
-
-		<echo
-			message="Compiling the deployment assets descriptor schema..." />
-		<xjc
-			schema="${basedir}/src/main/resources/packaging-assets.xsd"
-			package="org.apache.servicemix.descriptors.packaging.assets"
-			destdir="${basedir}/target/generated" />
-		
-	</preGoal>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+	
+	Copyright 2005 The Apache Software Foundation
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+
+<project xmlns:ant="jelly:ant"
+	xmlns:artifact="artifact">
+
+	<!-- redefined "build" goal from parent pom -->
+	<preGoal name="java:compile">
+		<echo message="Compiling the JBI descriptor schema..." />
+		<mkdir dir="${basedir}/target/generated" />
+		<taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask"
+			fork="true">
+			<classpath refid="maven.dependency.classpath" />
+		</taskdef>
+		<xjc schema="${basedir}/src/main/resources/jbi.xsd"
+			package="org.apache.servicemix.descriptors.jbi"
+			destdir="${basedir}/target/generated" />
+
+		<echo
+			message="Compiling the deployment assets descriptor schema..." />
+		<xjc
+			schema="${basedir}/src/main/resources/packaging-assets.xsd"
+			package="org.apache.servicemix.descriptors.packaging.assets"
+			destdir="${basedir}/target/generated" />
+		
+	</preGoal>
+
 </project>

Propchange: incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/pom.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/pom.xml Tue Feb 21 15:40:05 2006
@@ -1,77 +1,77 @@
-<!--
-
-    Copyright 2005 The Apache Software Foundation
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<project>
-	<parent>
-    <groupId>incubator-servicemix</groupId>
-    <artifactId>servicemix</artifactId>
-    <version>3.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-		
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>servicemix-packaging-descriptors</artifactId>
-	<name>ServiceMix :: Packaging Descriptors</name>
-	
-	<dependencies>
-		<!--  ServiceMix -->
-		<dependency>
-			<groupId>incubator-servicemix</groupId>
-			<artifactId>servicemix-jbi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>incubator-servicemix</groupId>
-			<artifactId>servicemix-common</artifactId>
-		</dependency>
-		
-		<!-- Activation (req. by JAXB2) -->
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>activation</artifactId>
-			<version>1.4</version>
-		</dependency>		
-		
-		<dependency>
-      <groupId>com.sun.xml</groupId>
-      <artifactId>jaxb-impl</artifactId>         
-    </dependency>
-    <dependency>
-       <groupId>xfire</groupId>
-       <artifactId>jaxb-api</artifactId>    
-    </dependency>
-	</dependencies>
-	<build>
-		<resources>
-			<resource>
-				<directory>${pom.build.sourceDirectory}</directory>
-				<includes>
-					<include>**/jaxb.index</include>
-				</includes>
-				<filtering>false</filtering>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
+<!--
+
+    Copyright 2005 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project>
+	<parent>
+    <groupId>incubator-servicemix</groupId>
+    <artifactId>servicemix</artifactId>
+    <version>3.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+		
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>servicemix-packaging-descriptors</artifactId>
+	<name>ServiceMix :: Packaging Descriptors</name>
+	
+	<dependencies>
+		<!--  ServiceMix -->
+		<dependency>
+			<groupId>incubator-servicemix</groupId>
+			<artifactId>servicemix-jbi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>incubator-servicemix</groupId>
+			<artifactId>servicemix-common</artifactId>
+		</dependency>
+		
+		<!-- Activation (req. by JAXB2) -->
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>activation</artifactId>
+			<version>1.4</version>
+		</dependency>		
+		
+		<dependency>
+      <groupId>com.sun.xml</groupId>
+      <artifactId>jaxb-impl</artifactId>         
+    </dependency>
+    <dependency>
+       <groupId>xfire</groupId>
+       <artifactId>jaxb-api</artifactId>    
+    </dependency>
+	</dependencies>
+	<build>
+		<resources>
+			<resource>
+				<directory>${pom.build.sourceDirectory}</directory>
+				<includes>
+					<include>**/jaxb.index</include>
+				</includes>
+				<filtering>false</filtering>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>

Propchange: incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/project.properties?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/project.properties (original)
+++ incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/project.properties Tue Feb 21 15:40:05 2006
@@ -1,3 +1,3 @@
-maven.compile.source=1.5
-maven.compile.target=1.5
+maven.compile.source=1.5
+maven.compile.target=1.5
 maven.test.source=1.5

Propchange: incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/project.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/project.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/project.xml Tue Feb 21 15:40:05 2006
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-	/*
-	* Copyright 2005 Unity Systems, LLC 
-	* 
-	* Licensed under the Apache License, Version 2.0 (the "License");
-	* you may not use this file except in compliance with the License.
-	* You may obtain a copy of the License at
-	* 
-	*      http://www.apache.org/licenses/LICENSE-2.0
-	* 
-	* Unless required by applicable law or agreed to in writing, software
-	* distributed under the License is distributed on an "AS IS" BASIS,
-	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	* See the License for the specific language governing permissions and
-	* limitations under the License.
-	*/
--->
-
-<project>
-	<pomVersion>3</pomVersion>
-	<extend>${basedir}/../../etc/project.xml</extend>
-
-	<name>ServiceMix :: Packaging Descriptors</name>
-	<id>servicemix-packaging-descriptors</id>
-	<description>Extension Packaging Descriptors for JBI</description>
-	<shortDescription>
-		Extension Packaging Descriptors for JBI
-	</shortDescription>
-
-	<dependencies>
-
-		<dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-activation_1.0.2_spec</artifactId>
-      <version>${geronimo_spec_activation_version}</version>
-    </dependency>
-
-		<dependency>
-			<groupId>servicemix</groupId>
-			<artifactId>jaxb-impl</artifactId>
-			<version>${jaxws_rt_version}</version>
-		</dependency>
-		<dependency>
-			<groupId>servicemix</groupId>
-			<artifactId>jaxb-xjc</artifactId>
-			<version>${jaxws_rt_version}</version>
-		</dependency>
-		<dependency>
-			<groupId>servicemix</groupId>
-			<artifactId>jaxb-api</artifactId>
-			<version>${jaxws_rt_version}</version>
-		</dependency>
-		<dependency>
-			<id>stax+api</id>
-			<version>${stax_api_version}</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>${basedir}/target/generated</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>${pom.build.sourceDirectory}</directory>
-				<includes>
-					<include>**/jaxb.index</include>
-				</includes>
-				<filtering>false</filtering>
-			</resource>			
-			<resource>
-				<directory>${basedir}/src/main/resources</directory>
-			</resource>
-		</resources>
-	</build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+	/*
+	* Copyright 2005 Unity Systems, LLC 
+	* 
+	* Licensed under the Apache License, Version 2.0 (the "License");
+	* you may not use this file except in compliance with the License.
+	* You may obtain a copy of the License at
+	* 
+	*      http://www.apache.org/licenses/LICENSE-2.0
+	* 
+	* Unless required by applicable law or agreed to in writing, software
+	* distributed under the License is distributed on an "AS IS" BASIS,
+	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	* See the License for the specific language governing permissions and
+	* limitations under the License.
+	*/
+-->
+
+<project>
+	<pomVersion>3</pomVersion>
+	<extend>${basedir}/../../etc/project.xml</extend>
+
+	<name>ServiceMix :: Packaging Descriptors</name>
+	<id>servicemix-packaging-descriptors</id>
+	<description>Extension Packaging Descriptors for JBI</description>
+	<shortDescription>
+		Extension Packaging Descriptors for JBI
+	</shortDescription>
+
+	<dependencies>
+
+		<dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+      <version>${geronimo_spec_activation_version}</version>
+    </dependency>
+
+		<dependency>
+			<groupId>servicemix</groupId>
+			<artifactId>jaxb-impl</artifactId>
+			<version>${jaxws_rt_version}</version>
+		</dependency>
+		<dependency>
+			<groupId>servicemix</groupId>
+			<artifactId>jaxb-xjc</artifactId>
+			<version>${jaxws_rt_version}</version>
+		</dependency>
+		<dependency>
+			<groupId>servicemix</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>${jaxws_rt_version}</version>
+		</dependency>
+		<dependency>
+			<id>stax+api</id>
+			<version>${stax_api_version}</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<sourceDirectory>${basedir}/target/generated</sourceDirectory>
+		<resources>
+			<resource>
+				<directory>${pom.build.sourceDirectory}</directory>
+				<includes>
+					<include>**/jaxb.index</include>
+				</includes>
+				<filtering>false</filtering>
+			</resource>			
+			<resource>
+				<directory>${basedir}/src/main/resources</directory>
+			</resource>
+		</resources>
+	</build>
+</project>

Propchange: incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/src/test/java/org/apache/servicemix/descriptors/deployment/assets/TestDeploymentMarshalling.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/src/test/java/org/apache/servicemix/descriptors/deployment/assets/TestDeploymentMarshalling.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/src/test/java/org/apache/servicemix/descriptors/deployment/assets/TestDeploymentMarshalling.java (original)
+++ incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/src/test/java/org/apache/servicemix/descriptors/deployment/assets/TestDeploymentMarshalling.java Tue Feb 21 15:40:05 2006
@@ -1,68 +1,68 @@
-package org.apache.servicemix.descriptors.deployment.assets;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-
-import junit.framework.TestCase;
-
-import org.apache.servicemix.descriptors.jbi.Jbi;
-import org.apache.servicemix.descriptors.packaging.assets.Assets;
-import org.apache.servicemix.descriptors.packaging.assets.Components;
-import org.apache.servicemix.descriptors.packaging.assets.Components.Component;
-import org.w3c.dom.Element;
-
-public class TestDeploymentMarshalling extends TestCase {
-
-	public void testComponentXml() {
-		JAXBContext context;
-		try {
-			context = JAXBContext.newInstance(Components.class.getPackage()
-					.getName());
-			Unmarshaller m = context.createUnmarshaller();
-			Components components = (Components) m.unmarshal(getClass()
-					.getClassLoader().getResourceAsStream("components.xml"));			
-			assertNotNull(components.getComponent());
-			assertEquals(1, components.getComponent().size());
-			Component component = components.getComponent().get(0);
-			assertEquals("servicemix-lwcontainer", component.getName());
-			assertNotNull(component.getAssets().getEngine());
-		} catch (JAXBException e) {
-			e.printStackTrace();
-			fail(e.getMessage());
-		}
-	}
-
-	public void testJbiXml() {
-		JAXBContext context;
-		try {
-			context = JAXBContext.newInstance(Jbi.class.getPackage().getName());
-			Unmarshaller m = context.createUnmarshaller();
-			Jbi jbi = (Jbi) m.unmarshal(getClass().getClassLoader()
-					.getResourceAsStream("jbi.xml"));
-			assertNotNull(jbi.getComponent());
-			assertEquals("servicemix-lwcontainer", jbi.getComponent()
-					.getIdentification().getName());
-			assertEquals("service-engine", jbi.getComponent().getType());
-			assertEquals("LightWeight Container", jbi.getComponent()
-					.getIdentification().getDescription());
-			Assets assets = null;
-			for (Element element : jbi.getComponent().getAnyOrAny()) {				
-				if (("http://servicemix.apache.org/component/packaging"
-						.equals(element.getNamespaceURI()))
-						&& ("assets".equals(element.getLocalName()))) {
-					context = JAXBContext.newInstance(Components.class
-							.getPackage().getName());
-					Unmarshaller m2 = context.createUnmarshaller();
-					assets = (Assets) m2.unmarshal(element);
-				}
-			}
-
-			assertNotNull(assets);
-			assertNotNull(assets.getEngine());
-		} catch (JAXBException e) {
-			e.printStackTrace();
-			fail(e.getMessage());
-		}
-	}
-}
+package org.apache.servicemix.descriptors.deployment.assets;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+
+import junit.framework.TestCase;
+
+import org.apache.servicemix.descriptors.jbi.Jbi;
+import org.apache.servicemix.descriptors.packaging.assets.Assets;
+import org.apache.servicemix.descriptors.packaging.assets.Components;
+import org.apache.servicemix.descriptors.packaging.assets.Components.Component;
+import org.w3c.dom.Element;
+
+public class TestDeploymentMarshalling extends TestCase {
+
+	public void testComponentXml() {
+		JAXBContext context;
+		try {
+			context = JAXBContext.newInstance(Components.class.getPackage()
+					.getName());
+			Unmarshaller m = context.createUnmarshaller();
+			Components components = (Components) m.unmarshal(getClass()
+					.getClassLoader().getResourceAsStream("components.xml"));			
+			assertNotNull(components.getComponent());
+			assertEquals(1, components.getComponent().size());
+			Component component = components.getComponent().get(0);
+			assertEquals("servicemix-lwcontainer", component.getName());
+			assertNotNull(component.getAssets().getEngine());
+		} catch (JAXBException e) {
+			e.printStackTrace();
+			fail(e.getMessage());
+		}
+	}
+
+	public void testJbiXml() {
+		JAXBContext context;
+		try {
+			context = JAXBContext.newInstance(Jbi.class.getPackage().getName());
+			Unmarshaller m = context.createUnmarshaller();
+			Jbi jbi = (Jbi) m.unmarshal(getClass().getClassLoader()
+					.getResourceAsStream("jbi.xml"));
+			assertNotNull(jbi.getComponent());
+			assertEquals("servicemix-lwcontainer", jbi.getComponent()
+					.getIdentification().getName());
+			assertEquals("service-engine", jbi.getComponent().getType());
+			assertEquals("LightWeight Container", jbi.getComponent()
+					.getIdentification().getDescription());
+			Assets assets = null;
+			for (Element element : jbi.getComponent().getAnyOrAny()) {				
+				if (("http://servicemix.apache.org/component/packaging"
+						.equals(element.getNamespaceURI()))
+						&& ("assets".equals(element.getLocalName()))) {
+					context = JAXBContext.newInstance(Components.class
+							.getPackage().getName());
+					Unmarshaller m2 = context.createUnmarshaller();
+					assets = (Assets) m2.unmarshal(element);
+				}
+			}
+
+			assertNotNull(assets);
+			assertNotNull(assets.getEngine());
+		} catch (JAXBException e) {
+			e.printStackTrace();
+			fail(e.getMessage());
+		}
+	}
+}

Propchange: incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/src/test/java/org/apache/servicemix/descriptors/deployment/assets/TestDeploymentMarshalling.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/src/test/resources/components.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/src/test/resources/components.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/src/test/resources/components.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/src/test/resources/components.xml Tue Feb 21 15:40:05 2006
@@ -1,18 +1,18 @@
-<componentPackaging:components
-	xmlns:componentPackaging="http://servicemix.apache.org/component/packaging">
-	<component name="servicemix-lwcontainer"
-		description="ServiceMix Lightweight Container"
-		type="service-engine">
-		<componentPackaging:assets>
-			<componentPackaging:connection name="defaultDestination"
-				description="Default destination" />
-			<componentPackaging:artifact name="servicemix.xml"
-				description="ServiceMix Definition" extension="xml" />
-			<componentPackaging:engine>
-				<packaging:ServiceAssemblyPackagingEngine
-					xmlns:packaging="java://org.apache.servicemix.packaging.engine">
-				</packaging:ServiceAssemblyPackagingEngine>
-			</componentPackaging:engine>
-		</componentPackaging:assets>
-	</component>
+<componentPackaging:components
+	xmlns:componentPackaging="http://servicemix.apache.org/component/packaging">
+	<component name="servicemix-lwcontainer"
+		description="ServiceMix Lightweight Container"
+		type="service-engine">
+		<componentPackaging:assets>
+			<componentPackaging:connection name="defaultDestination"
+				description="Default destination" />
+			<componentPackaging:artifact name="servicemix.xml"
+				description="ServiceMix Definition" extension="xml" />
+			<componentPackaging:engine>
+				<packaging:ServiceAssemblyPackagingEngine
+					xmlns:packaging="java://org.apache.servicemix.packaging.engine">
+				</packaging:ServiceAssemblyPackagingEngine>
+			</componentPackaging:engine>
+		</componentPackaging:assets>
+	</component>
 </componentPackaging:components>

Propchange: incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/src/test/resources/components.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/build.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/build.properties?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/build.properties (original)
+++ incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/build.properties Tue Feb 21 15:40:05 2006
@@ -1,3 +1,3 @@
-
-bin.includes = META-INF/,\
-               src/main/resources/
+
+bin.includes = META-INF/,\
+               src/main/resources/

Propchange: incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/build.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/maven.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/maven.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/maven.xml Tue Feb 21 15:40:05 2006
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-	
-	Copyright 2005 The Apache Software Foundation
-	
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
--->
-
-<project xmlns:ant="jelly:ant"
-	xmlns:artifact="artifact">
-
-	<!-- redefined "build" goal from parent pom -->
-	<preGoal name="java:compile">
-		<attainGoal name="eclipseplugin:generateManifest"/>	
-	</preGoal>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+	
+	Copyright 2005 The Apache Software Foundation
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+
+<project xmlns:ant="jelly:ant"
+	xmlns:artifact="artifact">
+
+	<!-- redefined "build" goal from parent pom -->
+	<preGoal name="java:compile">
+		<attainGoal name="eclipseplugin:generateManifest"/>	
+	</preGoal>
+
 </project>

Propchange: incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/plugin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/pom.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/pom.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/pom.xml Tue Feb 21 15:40:05 2006
@@ -1,293 +1,293 @@
-<!--
-	
-	Copyright 2005 The Apache Software Foundation
-	
-	Licensed 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.
--->
-<model
-	xsi:defaultSchemaLocation="http://maven.apache.org/maven-v4_0_0.xsd">	
-
-	<parent>
-		<groupId>incubator-servicemix</groupId>
-		<artifactId>servicemix</artifactId>
-		<version>3.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-  <modelVersion>4.0.0</modelVersion>
-	<artifactId>servicemix-packaging-eclipse-plugin</artifactId>
-	<name>ServiceMix :: Packaging Eclipse Plugin</name>
-
-	<dependencies>
-
-		<!--  ServiceMix Dependencies -->
-		<dependency>
-			<groupId>incubator-servicemix</groupId>
-			<artifactId>servicemix-common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>incubator-servicemix</groupId>
-			<artifactId>servicemix-packaging-descriptors</artifactId>
-			<version>3.0-SNAPSHOT</version>
-		</dependency>		
-
-		<!-- Activation (req. by JAXB2) -->
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>activation</artifactId>
-			<version>1.4</version>
-		</dependency>
-
-		<dependency>
-      <groupId>com.sun.xml</groupId>
-      <artifactId>jaxb-impl</artifactId>         
-    </dependency>
-    <dependency>
-       <groupId>xfire</groupId>
-       <artifactId>jaxb-api</artifactId>    
-    </dependency>		
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-		</dependency>
-
-		<!-- Plexus (for XMLWriter) -->
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-utils</artifactId>
-			<version>1.0.5</version>
-		</dependency>
-
-		<!-- Eclipse libraries -->
-		<dependency>
-				<artifactId>org.eclipse.text</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.gef</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.draw2d</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.ui.views</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.ui</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.help</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.core.resources</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.ui.ide</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.ui.forms</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.jface.text</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.ui.editors</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>
-					org.eclipse.ui.workbench.texteditor
-				</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.jface</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.ui.workbench</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.core.runtime</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.osgi</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.swt</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.ui.workbench</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.osgi</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.core.commands</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.wst.xml.core</artifactId>
-				<groupId>eclipse</groupId>
-				<version>0.7.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.wst.xml.ui</artifactId>
-				<groupId>eclipse</groupId>
-				<version>0.7.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.wst.sse.core</artifactId>
-				<groupId>eclipse</groupId>
-				<version>0.7.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.wst.sse.ui</artifactId>
-				<groupId>eclipse</groupId>
-				<version>0.7.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>
-					org.eclipse.wst.common.uriresolver
-				</artifactId>
-				<groupId>eclipse</groupId>
-				<version>0.7.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>
-					org.eclipse.wst.common.frameworks
-				</artifactId>
-				<groupId>eclipse</groupId>
-				<version>0.7.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.wst.dtd.core</artifactId>
-				<groupId>eclipse</groupId>
-				<version>0.7.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.wst.validation</artifactId>
-				<groupId>eclipse</groupId>
-				<version>0.7.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.wst.common.ui</artifactId>
-				<groupId>eclipse</groupId>
-				<version>0.7.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.emf.common</artifactId>
-				<groupId>eclipse</groupId>
-				<version>2.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.emf.ecore</artifactId>
-				<groupId>eclipse</groupId>
-				<version>2.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.emf.ecore.xmi</artifactId>
-				<groupId>eclipse</groupId>
-				<version>2.1.0</version>
-			</dependency>
-			<dependency>
-				<artifactId>org.eclipse.ui.intro</artifactId>
-				<groupId>eclipse</groupId>
-				<version>3.1.0</version>
-			</dependency>
-	</dependencies>
-
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>${pom.build.sourceDirectory}</directory>
-				<includes>
-					<include>**/jaxb.index</include>
-				</includes>
-				<filtering>false</filtering>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-				</configuration>
-			</plugin>
-			<plugin>			
-				<groupId>com.unity-systems.plugins</groupId>
-				<artifactId>maven2-eclipse-plugin-plugin</artifactId>
-				<configuration>
-					<packageName>com.unity.jbi.deployer</packageName>
-					<pluginClass>
-						com.unity.jbi.deployer.DeployerPlugin
-					</pluginClass>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<goals>
-							<goal>create-manifest</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</model>
+<!--
+	
+	Copyright 2005 The Apache Software Foundation
+	
+	Licensed 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.
+-->
+<model
+	xsi:defaultSchemaLocation="http://maven.apache.org/maven-v4_0_0.xsd">	
+
+	<parent>
+		<groupId>incubator-servicemix</groupId>
+		<artifactId>servicemix</artifactId>
+		<version>3.0-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+  <modelVersion>4.0.0</modelVersion>
+	<artifactId>servicemix-packaging-eclipse-plugin</artifactId>
+	<name>ServiceMix :: Packaging Eclipse Plugin</name>
+
+	<dependencies>
+
+		<!--  ServiceMix Dependencies -->
+		<dependency>
+			<groupId>incubator-servicemix</groupId>
+			<artifactId>servicemix-common</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>incubator-servicemix</groupId>
+			<artifactId>servicemix-packaging-descriptors</artifactId>
+			<version>3.0-SNAPSHOT</version>
+		</dependency>		
+
+		<!-- Activation (req. by JAXB2) -->
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>activation</artifactId>
+			<version>1.4</version>
+		</dependency>
+
+		<dependency>
+      <groupId>com.sun.xml</groupId>
+      <artifactId>jaxb-impl</artifactId>         
+    </dependency>
+    <dependency>
+       <groupId>xfire</groupId>
+       <artifactId>jaxb-api</artifactId>    
+    </dependency>		
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+		</dependency>
+
+		<!-- Plexus (for XMLWriter) -->
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-utils</artifactId>
+			<version>1.0.5</version>
+		</dependency>
+
+		<!-- Eclipse libraries -->
+		<dependency>
+				<artifactId>org.eclipse.text</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.gef</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.draw2d</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.ui.views</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.ui</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.help</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.core.resources</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.ui.ide</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.ui.forms</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.jface.text</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.ui.editors</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>
+					org.eclipse.ui.workbench.texteditor
+				</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.jface</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.ui.workbench</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.core.runtime</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.osgi</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.swt</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.ui.workbench</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.osgi</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.core.commands</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.wst.xml.core</artifactId>
+				<groupId>eclipse</groupId>
+				<version>0.7.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.wst.xml.ui</artifactId>
+				<groupId>eclipse</groupId>
+				<version>0.7.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.wst.sse.core</artifactId>
+				<groupId>eclipse</groupId>
+				<version>0.7.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.wst.sse.ui</artifactId>
+				<groupId>eclipse</groupId>
+				<version>0.7.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>
+					org.eclipse.wst.common.uriresolver
+				</artifactId>
+				<groupId>eclipse</groupId>
+				<version>0.7.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>
+					org.eclipse.wst.common.frameworks
+				</artifactId>
+				<groupId>eclipse</groupId>
+				<version>0.7.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.wst.dtd.core</artifactId>
+				<groupId>eclipse</groupId>
+				<version>0.7.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.wst.validation</artifactId>
+				<groupId>eclipse</groupId>
+				<version>0.7.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.wst.common.ui</artifactId>
+				<groupId>eclipse</groupId>
+				<version>0.7.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.emf.common</artifactId>
+				<groupId>eclipse</groupId>
+				<version>2.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.emf.ecore</artifactId>
+				<groupId>eclipse</groupId>
+				<version>2.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.emf.ecore.xmi</artifactId>
+				<groupId>eclipse</groupId>
+				<version>2.1.0</version>
+			</dependency>
+			<dependency>
+				<artifactId>org.eclipse.ui.intro</artifactId>
+				<groupId>eclipse</groupId>
+				<version>3.1.0</version>
+			</dependency>
+	</dependencies>
+
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<directory>${pom.build.sourceDirectory}</directory>
+				<includes>
+					<include>**/jaxb.index</include>
+				</includes>
+				<filtering>false</filtering>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+			<plugin>			
+				<groupId>com.unity-systems.plugins</groupId>
+				<artifactId>maven2-eclipse-plugin-plugin</artifactId>
+				<configuration>
+					<packageName>com.unity.jbi.deployer</packageName>
+					<pluginClass>
+						com.unity.jbi.deployer.DeployerPlugin
+					</pluginClass>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>compile</phase>
+						<goals>
+							<goal>create-manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</model>

Propchange: incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/project.properties?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/project.properties (original)
+++ incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/project.properties Tue Feb 21 15:40:05 2006
@@ -1,7 +1,7 @@
-maven.compile.source=1.5
-maven.compile.target=1.5
-maven.test.source=1.5
-
-# Eclipse Plugin
-eclipse.plugin.bundle.activator=org.apache.servicemix.packaging.DeployerPlugin
+maven.compile.source=1.5
+maven.compile.target=1.5
+maven.test.source=1.5
+
+# Eclipse Plugin
+eclipse.plugin.bundle.activator=org.apache.servicemix.packaging.DeployerPlugin
 eclipse.plugin.symbolicName=org.apache.servicemix.packaging.plugin

Propchange: incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native