Author: dwoods
Date: Wed May 27 18:20:08 2009
New Revision: 779264
URL: http://svn.apache.org/viewvc?rev=779264&view=rev
Log:
OPENJPA-1062 undo changes to openjpa-example for osgi testing
Modified:
openjpa/trunk/openjpa-examples/pom.xml
openjpa/trunk/openjpa-examples/src/main/java/hellojpa/Main.java
openjpa/trunk/openjpa-integration/osgi-itests/pom.xml
openjpa/trunk/pom.xml
Modified: openjpa/trunk/openjpa-examples/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/pom.xml?rev=779264&r1=779263&r2=779264&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/pom.xml Wed May 27 18:20:08 2009
@@ -55,11 +55,6 @@
<artifactId>commons-collections</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
<plugins>
Modified: openjpa/trunk/openjpa-examples/src/main/java/hellojpa/Main.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/src/main/java/hellojpa/Main.java?rev=779264&r1=779263&r2=779264&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/src/main/java/hellojpa/Main.java (original)
+++ openjpa/trunk/openjpa-examples/src/main/java/hellojpa/Main.java Wed May 27
18:20:08 2009
@@ -20,15 +20,13 @@
import java.util.*;
import javax.persistence.*;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
/**
* A very simple, stand-alone program that stores a new entity in the
* database and then performs a query to retrieve it.
*/
-public class Main implements BundleActivator {
+public class Main {
@SuppressWarnings("unchecked")
public static void main(String[] args) {
@@ -75,14 +73,5 @@
em2.close();
factory.close();
}
-
- public void start(BundleContext context) {
- System.out.println("Bundle start");
- main(null);
- }
-
- public void stop(BundleContext context) {
- System.out.println("Bundle stop");
- }
}
Modified: openjpa/trunk/openjpa-integration/osgi-itests/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/osgi-itests/pom.xml?rev=779264&r1=779263&r2=779264&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/osgi-itests/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/osgi-itests/pom.xml Wed May 27 18:20:08
2009
@@ -151,6 +151,11 @@
<version>0.3.3</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.2.0</version>
+ </dependency>
<!-- Apache Felix framework -->
<dependency>
<groupId>org.apache.felix</groupId>
Modified: openjpa/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=779264&r1=779263&r2=779264&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Wed May 27 18:20:08 2009
@@ -494,11 +494,6 @@
<artifactId>ant</artifactId>
<version>1.6.5</version>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
- </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
