[jboss-svn-commits] JBL Code SVN: r35680 - in labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-ms-impl: src/main/java/org/drools/repository/modeshape and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: kurt.stam at jboss.com
Date: 2010-10-23 21:57:30 -0400 (Sat, 23 Oct 2010)
New Revision: 35680

Added:
   labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-ms-impl/src/main/java/org/drools/repository/modeshape/ModeShapeRepositoryConfiguratorWithJAAS.java
Modified:
   labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-ms-impl/
   labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-ms-impl/pom.xml
   labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-ms-impl/src/main/java/org/drools/repository/modeshape/ModeShapeRepositoryConfigurator.java
Log:
BRMS-406 adding the modeshape implementation, JAAS version for testing only, updating to use MS 2.3


Property changes on: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-ms-impl
___________________________________________________________________
Name: svn:ignore
   - target

   + target
.settings
.classpath
.project


Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-ms-impl/pom.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-ms-impl/pom.xml	2010-10-22 18:22:07 UTC (rev 35679)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-ms-impl/pom.xml	2010-10-24 01:57:30 UTC (rev 35680)
@@ -9,7 +9,7 @@
    </parent>
    <artifactId>drools-repository-jcr-ms-impl</artifactId>
    <packaging>jar</packaging>
-   <name>Drools :: Repository :: ModeShape</name>
+   <name>Drools :: Repository :: JCR ModeShape</name>
    
    <dependencies>
       
@@ -21,39 +21,24 @@
        <dependency>
         <groupId>org.modeshape</groupId>
         <artifactId>modeshape-jcr</artifactId>
-        <version>2.3-SNAPSHOT</version>
+        <version>2.3.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jboss-idtrust</artifactId>
         <version>2.0.2.CR1</version>
       </dependency>
-	    <dependency>
-	      <groupId>com.google.collections</groupId>
-	      <artifactId>google-collections</artifactId>
-        <version>1.0</version>
-	    </dependency>
       <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jboss-security-spi-bare</artifactId>
         <version>2.0.2.SP6</version>
-        <!--   <scope>test</scope> -->
+        <scope>runtime</scope>
       </dependency>
       <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jbosssx-bare</artifactId>
         <version>2.0.2.SP6</version>
-        <!-- <scope>test</scope>  -->
-        <exclusions>
-          <exclusion>
-            <groupId>apache-xalan</groupId>
-            <artifactId>xalan</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>apache-xalan</groupId>
-            <artifactId>serializer</artifactId>
-          </exclusion>
-        </exclusions>
+        <scope>runtime</scope>
       </dependency>
       
    </dependencies>

Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-ms-impl/src/main/java/org/drools/repository/modeshape/ModeShapeRepositoryConfigurator.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-ms-impl/src/main/java/org/drools/repository/modeshape/ModeShapeRepositoryConfigurator.java	2010-10-22 18:22:07 UTC (rev 35679)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-ms-impl/src/main/java/org/drools/repository/modeshape/ModeShapeRepositoryConfigurator.java	2010-10-24 01:57:30 UTC (rev 35680)
@@ -5,28 +5,14 @@
 import javax.jcr.Workspace;
 
 import org.drools.repository.JCRRepositoryConfigurator;
-import org.jboss.security.config.IDTrustConfiguration;
 import org.modeshape.jcr.CndNodeTypeReader;
 
 /**
- * This specialized {@link JCRRepositoryConfigurator} simply initializes the IDTrust JAAS implementation optionally used by
- * ModeShape for authentication and authorization.
+ * This specialized {@link JCRRepositoryConfigurator} 
  */
 public class ModeShapeRepositoryConfigurator extends JCRRepositoryConfigurator {
 
-    static {
-        // Initialize IDTrust
-        String configFile = "modeshape/jaas.conf.xml";
-        IDTrustConfiguration idtrustConfig = new IDTrustConfiguration();
-        try {
-            idtrustConfig.config(configFile);
-        } catch (Exception ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-
-    public ModeShapeRepositoryConfigurator() {
-    }
+    public ModeShapeRepositoryConfigurator() {}
     
 	public void registerNodeTypesFromCndFile(String cndFileName, Session session, Workspace workspace)
 			throws RepositoryException {

Added: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-ms-impl/src/main/java/org/drools/repository/modeshape/ModeShapeRepositoryConfiguratorWithJAAS.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-ms-impl/src/main/java/org/drools/repository/modeshape/ModeShapeRepositoryConfiguratorWithJAAS.java	                        (rev 0)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-repo/jcr-ms-impl/src/main/java/org/drools/repository/modeshape/ModeShapeRepositoryConfiguratorWithJAAS.java	2010-10-24 01:57:30 UTC (rev 35680)
@@ -0,0 +1,22 @@
+package org.drools.repository.modeshape;
+
+import org.drools.repository.JCRRepositoryConfigurator;
+import org.jboss.security.config.IDTrustConfiguration;
+
+/**
+ * This specialized {@link JCRRepositoryConfigurator} simply initializes the IDTrust JAAS implementation optionally used by
+ * ModeShape for authentication and authorization.
+ */
+public class ModeShapeRepositoryConfiguratorWithJAAS extends ModeShapeRepositoryConfigurator {
+
+    static {
+        // Initialize IDTrust
+        String configFile = "modeshape/jaas.conf.xml";
+        IDTrustConfiguration idtrustConfig = new IDTrustConfiguration();
+        try {
+            idtrustConfig.config(configFile);
+        } catch (Exception ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+}