Permalink
Browse files

following changes in community

  • Loading branch information...
1 parent 6293e80 commit a1457d9c923250f7d82791755ecafd6e0bcdb185 @peterneubauer peterneubauer committed Apr 18, 2012
Showing with 10 additions and 96 deletions.
  1. +0 −89 bundle/pom.xml
  2. +7 −0 examples/pom.xml
  3. +3 −4 examples/src/test/java/org/neo4j/examples/osgi/Neo4jActivator.java
  4. +0 −3 pom.xml
View
@@ -1,89 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.neo4j.build</groupId>
- <artifactId>osgi-build</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
- </parent>
-
- <groupId>org.neo4j</groupId>
- <artifactId>neo4j-osgi-bundle</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <name>Neo4j OSGi default bundle</name>
- <properties>
- <bundle.namespace>org.neo4j</bundle.namespace>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.neo4j</groupId>
- <artifactId>neo4j</artifactId>
- <version>${neo4j.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.neo4j</groupId>
- <artifactId>neo4j-cypher-dsl</artifactId>
- <version>1.5</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
- <scope>provided</scope>
- </dependency>
-
-
- <!-- For sane logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.6.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Name>${project.name}</Bundle-Name>
- <Bundle-Version>${project.version}</Bundle-Version>
- <Import-Package>!com.sun.*,!sun.misc.*,com.mysema.query.*;version="[2.2.5, 3)";resolution:="optional",org.codehaus.jackson.*;version="[1.9.1,2)";resolution:="optional",javax.transaction.*;version="[1.0.1, 2.0.0)",*;</Import-Package>
- <Export-Package>org.neo4j.*;version="${neo4j.version}",*</Export-Package>
- <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <repositories>
- <repository>
- <id>neo4j-public-repository</id>
- <name>Publically available Maven 2 repository for Neo4j</name>
- <url>http://m2.neo4j.org</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
-</project>
View
@@ -37,6 +37,13 @@
<version>${neo4jversion}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.neo4j</groupId>
+ <artifactId>neo4j-kernel</artifactId>
+ <version>${neo4jversion}</version>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
@@ -26,11 +26,11 @@
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Relationship;
import org.neo4j.graphdb.Transaction;
+import org.neo4j.graphdb.factory.GraphDatabaseFactory;
import org.neo4j.graphdb.index.Index;
import org.neo4j.graphdb.index.IndexProvider;
import org.neo4j.index.lucene.LuceneIndexProvider;
import org.neo4j.kernel.ListIndexIterable;
-import org.neo4j.test.TestGraphDatabaseFactory;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
@@ -51,10 +51,9 @@ public void start( BundleContext context ) throws Exception
provs.add( lucene );
ListIndexIterable providers = new ListIndexIterable();
providers .setIndexProviders( provs );
- TestGraphDatabaseFactory gdbf = new TestGraphDatabaseFactory();
+ GraphDatabaseFactory gdbf = new GraphDatabaseFactory();
gdbf.setIndexProviders( providers );
-// db = gdbf.newImpermanentDatabaseBuilder()( "/Users/peterneubauer/code/tmp/db-" + System.currentTimeMillis()).newGraphDatabase();
- db = gdbf.newImpermanentDatabaseBuilder().newGraphDatabase();
+ db = gdbf.newEmbeddedDatabase( "target/db");
System.out.println("created database, db="+db);
serviceRegistration = context.registerService( GraphDatabaseService.class.getName(), db, new Properties() );
System.out.println("registered " + serviceRegistration.getReference());
View
@@ -29,9 +29,6 @@
</scm>
<modules>
- <!--module>bundle</module-->
- <!--module>test-bundle</module-->
- <!--module>sdn-test-bundle</module-->
<module>examples</module>
</modules>

0 comments on commit a1457d9

Please sign in to comment.