[jboss-svn-commits] JBL Code SVN: r36344 - in labs/jbossrules/trunk: drools-guvnor and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Dec 10 03:38:06 EST 2010
Author: ge0ffrey
Date: 2010-12-10 03:38:05 -0500 (Fri, 10 Dec 2010)
New Revision: 36344
Modified:
labs/jbossrules/trunk/drools-guvnor/pom.xml
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/ActionAPIServletTest.java
labs/jbossrules/trunk/drools-repository-parent/drools-repository/pom.xml
labs/jbossrules/trunk/drools-repository-parent/pom.xml
labs/jbossrules/trunk/pom.xml
Log:
make modeshape dependency optional +remove svnkit dependency + use other Base64 in tests + don't depend on modeshape if build on jdk 1.5
Modified: labs/jbossrules/trunk/drools-guvnor/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/pom.xml 2010-12-10 07:16:30 UTC (rev 36343)
+++ labs/jbossrules/trunk/drools-guvnor/pom.xml 2010-12-10 08:38:05 UTC (rev 36344)
@@ -143,36 +143,12 @@
<dependencies>
<!-- Internal dependencies -->
- <!-- first the deps for the repo API itself (Jackrabbit based) -->
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-repository</artifactId>
</dependency>
<dependency>
<groupId>org.drools</groupId>
- <artifactId>drools-repository-modeshape-connector</artifactId>
- <scope>runtime</scope><!-- TODO should this not be test or this dependency deleted? -->
- <exclusions>
- <exclusion>
- <groupId>org.modeshape</groupId>
- <artifactId>modeshape-jcr</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.security</groupId>
- <artifactId>jboss-idtrust</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi-bare</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx-bare</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
</dependency>
<dependency>
@@ -307,11 +283,6 @@
</dependency>
<!-- NOT needed due to licencing -->
<dependency>
- <groupId>org.tmatesoft</groupId>
- <artifactId>svnkit</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-embedded</artifactId>
<scope>test</scope>
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/ActionAPIServletTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/ActionAPIServletTest.java 2010-12-10 07:16:30 UTC (rev 36343)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/ActionAPIServletTest.java 2010-12-10 08:38:05 UTC (rev 36344)
@@ -17,7 +17,6 @@
package org.drools.guvnor.server.files;
-import ch.ethz.ssh2.crypto.Base64;
import java.io.ByteArrayInputStream;
import java.util.HashMap;
import java.util.UUID;
@@ -25,6 +24,7 @@
import org.drools.guvnor.server.rest.Parameters;
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.RulesRepository;
+import org.drools.util.codec.Base64;
/**
* Some basic unit tests for compilation and snapshot
@@ -48,7 +48,7 @@
repo.createPackage(dynamicPackage, "test-action package for testing");
HashMap<String, String> headers = new HashMap<String, String>() {
{
- put("Authorization", "BASIC " + new String(Base64.encode(
+ put("Authorization", "BASIC " + new String(new Base64().encode(
"test:password".getBytes())));
}
};
@@ -73,7 +73,7 @@
repo.createPackage(dynamicPackage, "test-snapshot package for testing");
HashMap<String, String> headers = new HashMap<String, String>() {
{
- put("Authorization", "BASIC " + new String(Base64.encode("test:password".getBytes())));
+ put("Authorization", "BASIC " + new String(new Base64().encode("test:password".getBytes())));
}
};
HashMap<String,String> parameters = new HashMap<String,String>() {
Modified: labs/jbossrules/trunk/drools-repository-parent/drools-repository/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-repository-parent/drools-repository/pom.xml 2010-12-10 07:16:30 UTC (rev 36343)
+++ labs/jbossrules/trunk/drools-repository-parent/drools-repository/pom.xml 2010-12-10 08:38:05 UTC (rev 36344)
@@ -11,7 +11,7 @@
<artifactId>drools-repository</artifactId>
<packaging>jar</packaging>
<name>Drools :: Repository :: Repository</name>
-
+
<build>
<finalName>drools-repository</finalName>
<plugins>
@@ -43,14 +43,8 @@
<groupId>org.drools</groupId>
<artifactId>drools-repository-jackrabbit-connector</artifactId>
<scope>runtime</scope>
+ <!-- Not optional so guvnor works out of the box, exclude this dependency if you use modeshape -->
</dependency>
- <!-- use this instead of jackrabbit (jr) above for ModeShape
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-repository-modeshape-connector</artifactId>
- <scope>runtime</scope>
- </dependency>
- -->
<!-- External dependencies -->
<dependency>
@@ -58,10 +52,6 @@
<artifactId>jcr</artifactId>
</dependency>
<dependency>
- <groupId>org.tmatesoft</groupId>
- <artifactId>svnkit</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -79,4 +69,22 @@
<artifactId>xstream</artifactId>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jdk6OrHigher</id>
+ <activation>
+ <jdk>[1.6,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-repository-modeshape-connector</artifactId>
+ <scope>runtime</scope>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
Modified: labs/jbossrules/trunk/drools-repository-parent/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-repository-parent/pom.xml 2010-12-10 07:16:30 UTC (rev 36343)
+++ labs/jbossrules/trunk/drools-repository-parent/pom.xml 2010-12-10 08:38:05 UTC (rev 36344)
@@ -20,7 +20,7 @@
<profiles>
<profile>
- <id>jdk6</id>
+ <id>jdk6OrHigher</id>
<activation>
<jdk>[1.6,)</jdk>
</activation>
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2010-12-10 07:16:30 UTC (rev 36343)
+++ labs/jbossrules/trunk/pom.xml 2010-12-10 08:38:05 UTC (rev 36344)
@@ -1190,11 +1190,6 @@
<version>2.0</version>
</dependency>
<dependency>
- <groupId>org.tmatesoft</groupId>
- <artifactId>svnkit</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.10</version>
More information about the jboss-svn-commits
mailing list