You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by pd...@apache.org on 2006/02/20 22:07:25 UTC
svn commit: r379239 - in /incubator/servicemix/trunk/tooling:
servicemix-packaging-descriptors/ servicemix-packaging-eclipse-plugin/
servicemix-packaging-eclipse-plugin/src/main/java/org/apache/servicemix/packaging/
Author: pdodds
Date: Mon Feb 20 13:07:22 2006
New Revision: 379239
URL: http://svn.apache.org/viewcvs?rev=379239&view=rev
Log:
Switch over to new XBean and updated activation to use geronimo versions
Modified:
incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/project.xml
incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/project.xml
incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/src/main/java/org/apache/servicemix/packaging/ComponentArtifact.java
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=379239&r1=379238&r2=379239&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/project.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/project.xml Mon Feb 20 13:07:22 2006
@@ -31,10 +31,10 @@
<dependencies>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.4</version>
- </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>
Modified: incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/project.xml?rev=379239&r1=379238&r2=379239&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/project.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/project.xml Mon Feb 20 13:07:22 2006
@@ -58,22 +58,27 @@
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.4</version>
- </dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+ <version>${geronimo_spec_activation_version}</version>
+ </dependency>
<!-- XBean -->
<dependency>
- <groupId>org.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <version>${xbean_version}</version>
- </dependency>
- <dependency>
- <groupId>org.xbean</groupId>
- <artifactId>xbean-kernel</artifactId>
- <version>${xbean_version}</version>
- </dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>${xbean_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-server</artifactId>
+ <version>${xbean_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-kernel</artifactId>
+ <version>${xbean_version}</version>
+ </dependency>
<dependency>
<groupId>springframework</groupId>
<artifactId>spring</artifactId>
Modified: incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/src/main/java/org/apache/servicemix/packaging/ComponentArtifact.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/src/main/java/org/apache/servicemix/packaging/ComponentArtifact.java?rev=379239&r1=379238&r2=379239&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/src/main/java/org/apache/servicemix/packaging/ComponentArtifact.java (original)
+++ incubator/servicemix/trunk/tooling/servicemix-packaging-eclipse-plugin/src/main/java/org/apache/servicemix/packaging/ComponentArtifact.java Mon Feb 20 13:07:22 2006
@@ -28,8 +28,6 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
@@ -37,11 +35,11 @@
import org.apache.servicemix.descriptors.packaging.assets.Components;
import org.apache.servicemix.descriptors.packaging.assets.Components.Component;
import org.apache.servicemix.packaging.engine.PackagingEngine;
+import org.apache.xbean.spring.context.ResourceXmlApplicationContext;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
import org.springframework.core.io.ByteArrayResource;
import org.w3c.dom.Element;
-import org.xbean.spring.context.ResourceXmlApplicationContext;
/**
* A base container for the information and resources in a Component Artifact