[jboss-svn-commits] JBL Code SVN: r36268 - in labs/jbossrules/trunk/drools-repo: jcr-jr-impl and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Dec 8 12:41:27 EST 2010
Author: kurt.stam at jboss.com
Date: 2010-12-08 12:41:27 -0500 (Wed, 08 Dec 2010)
New Revision: 36268
Added:
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/pom.xml
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/drools/
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/drools/repository/
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/drools/repository/jackrabbit/
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/drools/repository/jackrabbit/JackrabbitRepositoryConfigurator.java
Removed:
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/pom.xml
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/drools/
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/drools/repository/
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/drools/repository/jackrabbit/
labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/drools/repository/jackrabbit/JackrabbitRepositoryConfigurator.java
Modified:
labs/jbossrules/trunk/drools-repo/pom.xml
Log:
GUVNORSOA-47, merging ModeShape Integration r35616, adding JackRabbit module
Copied: labs/jbossrules/trunk/drools-repo/jcr-jr-impl (from rev 35616, labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-jr-impl)
Property changes on: labs/jbossrules/trunk/drools-repo/jcr-jr-impl
___________________________________________________________________
Name: svn:ignore
+ target
Deleted: labs/jbossrules/trunk/drools-repo/jcr-jr-impl/pom.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-jr-impl/pom.xml 2010-10-20 22:55:15 UTC (rev 35616)
+++ labs/jbossrules/trunk/drools-repo/jcr-jr-impl/pom.xml 2010-12-08 17:41:27 UTC (rev 36268)
@@ -1,27 +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>
- <artifactId>drools</artifactId>
- <groupId>org.drools</groupId>
- <version>5.1.0.BRMS</version>
- </parent>
- <artifactId>jcr-jr-impl</artifactId>
- <packaging>jar</packaging>
- <name>Drools :: Repository :: JR</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- </dependency>
- <dependency>
- <artifactId>drools-repository-jcr-api</artifactId>
- <groupId>org.drools</groupId>
- <version>5.1.0.BRMS</version>
- </dependency>
-
- </dependencies>
-</project>
Copied: labs/jbossrules/trunk/drools-repo/jcr-jr-impl/pom.xml (from rev 35616, labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-jr-impl/pom.xml)
===================================================================
--- labs/jbossrules/trunk/drools-repo/jcr-jr-impl/pom.xml (rev 0)
+++ labs/jbossrules/trunk/drools-repo/jcr-jr-impl/pom.xml 2010-12-08 17:41:27 UTC (rev 36268)
@@ -0,0 +1,27 @@
+<?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>
+ <artifactId>drools</artifactId>
+ <groupId>org.drools</groupId>
+ <version>5.2.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>jcr-jr-impl</artifactId>
+ <packaging>jar</packaging>
+ <name>Drools :: Repository :: JR</name>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ </dependency>
+ <dependency>
+ <artifactId>drools-repository-jcr-api</artifactId>
+ <groupId>org.drools</groupId>
+ <version>5.1.0.BRMS</version>
+ </dependency>
+
+ </dependencies>
+</project>
Copied: labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src (from rev 35616, labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-jr-impl/src)
Copied: labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main (from rev 35616, labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-jr-impl/src/main)
Copied: labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java (from rev 35616, labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-jr-impl/src/main/java)
Copied: labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org (from rev 35616, labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-jr-impl/src/main/java/org)
Copied: labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/drools (from rev 35616, labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-jr-impl/src/main/java/org/drools)
Copied: labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/drools/repository (from rev 35616, labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-jr-impl/src/main/java/org/drools/repository)
Copied: labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/drools/repository/jackrabbit (from rev 35616, labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-jr-impl/src/main/java/org/drools/repository/jackrabbit)
Deleted: labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/drools/repository/jackrabbit/JackrabbitRepositoryConfigurator.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-jr-impl/src/main/java/org/drools/repository/jackrabbit/JackrabbitRepositoryConfigurator.java 2010-10-20 22:55:15 UTC (rev 35616)
+++ labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/drools/repository/jackrabbit/JackrabbitRepositoryConfigurator.java 2010-12-08 17:41:27 UTC (rev 36268)
@@ -1,81 +0,0 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * 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.drools.repository.jackrabbit;
-
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.Properties;
-
-import javax.jcr.Repository;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.Workspace;
-
-import org.apache.jackrabbit.commons.cnd.CndImporter;
-import org.apache.jackrabbit.core.TransientRepository;
-import org.drools.repository.JCRRepositoryConfigurator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This contains code to initialise the repository for jackrabbit.
- * This is mostly a collection of utilities.
- * Any jackrabbit specific code needs to go in here.
- */
-public class JackrabbitRepositoryConfigurator extends JCRRepositoryConfigurator {
-
- private static final Logger log = LoggerFactory.getLogger(JackrabbitRepositoryConfigurator.class);
- private static TransientRepository transientRepository = null;
-
- /* (non-Javadoc)
- * @see org.drools.repository.RepositoryConfigurator#getJCRRepository()
- */
- @Override
- public Repository getJCRRepository(Properties properties) throws RepositoryException {
-
- String repoRootDir = properties.getProperty(REPOSITORY_ROOT_DIRECTORY);
- if (repoRootDir == null) {
- transientRepository = new TransientRepository();
- } else {
- transientRepository = new TransientRepository(repoRootDir + "/repository.xml", repoRootDir);
- }
- return transientRepository;
-
- }
-
- public void registerNodeTypesFromCndFile(String cndFileName, Session session, Workspace workspace) throws RepositoryException {
- try {
- //Read in the CND file
- Reader in = new InputStreamReader(this.getClass().getResourceAsStream( cndFileName ));
- CndImporter.registerNodeTypes(in, session);
-
- } catch(Exception e) {
- log.error("Caught Exception", e);
- throw new RepositoryException(e);
- }
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.drools.repository.JCRRepositoryConfigurator#shutdown()
- */
- public void shutdown() {
- transientRepository.shutdown();
- }
-
-}
Copied: labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/drools/repository/jackrabbit/JackrabbitRepositoryConfigurator.java (from rev 35616, labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-jr-impl/src/main/java/org/drools/repository/jackrabbit/JackrabbitRepositoryConfigurator.java)
===================================================================
--- labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/drools/repository/jackrabbit/JackrabbitRepositoryConfigurator.java (rev 0)
+++ labs/jbossrules/trunk/drools-repo/jcr-jr-impl/src/main/java/org/drools/repository/jackrabbit/JackrabbitRepositoryConfigurator.java 2010-12-08 17:41:27 UTC (rev 36268)
@@ -0,0 +1,81 @@
+/**
+ * Copyright 2010 JBoss Inc
+ *
+ * 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.drools.repository.jackrabbit;
+
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Properties;
+
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.Workspace;
+
+import org.apache.jackrabbit.commons.cnd.CndImporter;
+import org.apache.jackrabbit.core.TransientRepository;
+import org.drools.repository.JCRRepositoryConfigurator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This contains code to initialise the repository for jackrabbit.
+ * This is mostly a collection of utilities.
+ * Any jackrabbit specific code needs to go in here.
+ */
+public class JackrabbitRepositoryConfigurator extends JCRRepositoryConfigurator {
+
+ private static final Logger log = LoggerFactory.getLogger(JackrabbitRepositoryConfigurator.class);
+ private static TransientRepository transientRepository = null;
+
+ /* (non-Javadoc)
+ * @see org.drools.repository.RepositoryConfigurator#getJCRRepository()
+ */
+ @Override
+ public Repository getJCRRepository(Properties properties) throws RepositoryException {
+
+ String repoRootDir = properties.getProperty(REPOSITORY_ROOT_DIRECTORY);
+ if (repoRootDir == null) {
+ transientRepository = new TransientRepository();
+ } else {
+ transientRepository = new TransientRepository(repoRootDir + "/repository.xml", repoRootDir);
+ }
+ return transientRepository;
+
+ }
+
+ public void registerNodeTypesFromCndFile(String cndFileName, Session session, Workspace workspace) throws RepositoryException {
+ try {
+ //Read in the CND file
+ Reader in = new InputStreamReader(this.getClass().getResourceAsStream( cndFileName ));
+ CndImporter.registerNodeTypes(in, session);
+
+ } catch(Exception e) {
+ log.error("Caught Exception", e);
+ throw new RepositoryException(e);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.drools.repository.JCRRepositoryConfigurator#shutdown()
+ */
+ public void shutdown() {
+ transientRepository.shutdown();
+ }
+
+}
Modified: labs/jbossrules/trunk/drools-repo/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-repo/pom.xml 2010-12-08 17:32:19 UTC (rev 36267)
+++ labs/jbossrules/trunk/drools-repo/pom.xml 2010-12-08 17:41:27 UTC (rev 36268)
@@ -11,7 +11,8 @@
<packaging>pom</packaging>
<name>Drools :: Repository :: Parent</name>
<modules>
+ <module>drools-repository</module>
<module>jcr-api</module>
- <module>drools-repository</module>
+ <module>jcr-jr-impl</module>
</modules>
</project>
More information about the jboss-svn-commits
mailing list