Author: clement
Date: Tue Apr 28 16:53:27 2009
New Revision: 769460
URL: http://svn.apache.org/viewvc?rev=769460&view=rev
Log:
Add a static method simplyfing the code, Add a dependency on xerces (avoiding
that users depends on it)
Modified:
felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target.tests/pom.xml
felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target.tests/src/test/java/org/apache/felix/ipojo/pax/exam/target/tests/BundleCreationTest.java
felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target/pom.xml
felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target/src/main/java/org/apache/felix/ipojo/pax/exam/target/BundleAsiPOJO.java
Modified:
felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target.tests/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target.tests/pom.xml?rev=769460&r1=769459&r2=769460&view=diff
==============================================================================
---
felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target.tests/pom.xml
(original)
+++
felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target.tests/pom.xml
Tue Apr 28 16:53:27 2009
@@ -100,12 +100,7 @@
<artifactId>org.apache.felix.ipojo.pax.exam.target</artifactId>
<version>0.9.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.4.0</version>
- </dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.annotations</artifactId>
<version>1.2.0</version>
Modified:
felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target.tests/src/test/java/org/apache/felix/ipojo/pax/exam/target/tests/BundleCreationTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target.tests/src/test/java/org/apache/felix/ipojo/pax/exam/target/tests/BundleCreationTest.java?rev=769460&r1=769459&r2=769460&view=diff
==============================================================================
---
felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target.tests/src/test/java/org/apache/felix/ipojo/pax/exam/target/tests/BundleCreationTest.java
(original)
+++
felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target.tests/src/test/java/org/apache/felix/ipojo/pax/exam/target/tests/BundleCreationTest.java
Tue Apr 28 16:53:27 2009
@@ -6,6 +6,7 @@
import static org.ops4j.pax.tinybundles.core.TinyBundles.asURL;
import static org.ops4j.pax.tinybundles.core.TinyBundles.newBundle;
import static org.ops4j.pax.tinybundles.core.TinyBundles.with;
+import static
org.apache.felix.ipojo.pax.exam.target.BundleAsiPOJO.asiPOJOBundle;
import java.io.File;
import java.net.MalformedURLException;
@@ -74,7 +75,7 @@
.set(Constants.BUNDLE_SYMBOLICNAME,"Provider")
.set(Constants.IMPORT_PACKAGE,
"org.apache.felix.ipojo.pax.exam.target.tests.service")
)
- .build( new BundleAsiPOJO(new File("provider.jar"),
new File("provider.xml")) ).toExternalForm()
+ .build( asiPOJOBundle(new File("provider.jar"), new
File("provider.xml")) ).toExternalForm()
),
provision(newBundle()
.addClass(Consumer.class)
@@ -84,7 +85,7 @@
.set(Constants.IMPORT_PACKAGE,
"org.apache.felix.ipojo.pax.exam.target.tests.service"))
.build(
- new BundleAsiPOJO(new File("cons.jar"),
+ asiPOJOBundle(new File("cons.jar"),
new File("consumer.xml")))
.toExternalForm())
Modified:
felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target/pom.xml?rev=769460&r1=769459&r2=769460&view=diff
==============================================================================
---
felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target/pom.xml
(original)
+++
felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target/pom.xml
Tue Apr 28 16:53:27 2009
@@ -6,25 +6,31 @@
<packaging>jar</packaging>
<version>0.9.0-SNAPSHOT</version>
<name>BundleAsiPOJO</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.tinybundles</groupId>
- <artifactId>pax-tinybundles-core</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.tinybundles</groupId>
+ <artifactId>pax-tinybundles-core</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
Modified:
felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target/src/main/java/org/apache/felix/ipojo/pax/exam/target/BundleAsiPOJO.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target/src/main/java/org/apache/felix/ipojo/pax/exam/target/BundleAsiPOJO.java?rev=769460&r1=769459&r2=769460&view=diff
==============================================================================
---
felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target/src/main/java/org/apache/felix/ipojo/pax/exam/target/BundleAsiPOJO.java
(original)
+++
felix/sandbox/clement/BundleAsiPOJO/org.apache.felix.ipojo.pax.exam.target/src/main/java/org/apache/felix/ipojo/pax/exam/target/BundleAsiPOJO.java
Tue Apr 28 16:53:27 2009
@@ -14,6 +14,11 @@
private File m_metadata;
private File m_file;
+
+ public static BundleAs<URL> asiPOJOBundle(File file, File metadata) {
+ return (new BundleAsiPOJO(file, metadata));
+ }
+
public BundleAsiPOJO (File file, File metadata) {
m_metadata = metadata;
m_file = file;
