[jboss-svn-commits] JBL Code SVN: r31607 - in labs/jbossrules/trunk/bundle-repository: org.drools.osgi.test and 2 other directories.

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

Author: mark.proctor at jboss.com
Date: 2010-02-12 08:48:18 -0500 (Fri, 12 Feb 2010)
New Revision: 31607

Added:
   labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/decisiontable/Dummy.java
Removed:
   labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/decisiontable/Test.java
Modified:
   labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/
   labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java
   labs/jbossrules/trunk/bundle-repository/pom.xml
Log:
JBRULES-2351 OSGi Ready 
-tweaked so that the test project does not also create a plugins directory


Property changes on: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test
___________________________________________________________________
Name: svn:ignore
   + .settings
eclipse_config
target


Modified: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java	2010-02-12 13:33:02 UTC (rev 31606)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java	2010-02-12 13:48:18 UTC (rev 31607)
@@ -10,7 +10,7 @@
 import org.drools.builder.KnowledgeBuilderConfiguration;
 import org.drools.builder.KnowledgeBuilderFactoryService;
 import org.drools.builder.ResourceType;
-import org.test.decisiontable.Test;
+import org.test.decisiontable.Dummy;
 import org.drools.io.ResourceFactoryService;
 import org.drools.osgi.test.AbstractDroolsSpringDMTest;
 import org.drools.runtime.StatefulKnowledgeSession;
@@ -112,7 +112,7 @@
                                                                                                                 getClass().getClassLoader() );
         KnowledgeBuilder kbuilder = knowledgeBuilderFactoryService.newKnowledgeBuilder( kbConf );
         kbuilder.add( resourceFactoryService.newClassPathResource( "changeset1Test.xml",
-                                                                   Test.class ),
+                                                                   Dummy.class ),
                       ResourceType.CHANGE_SET );
 
         kbaseConf = knowledgeBaseFactoryService.newKnowledgeBaseConfiguration( null,

Copied: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/decisiontable/Dummy.java (from rev 31606, labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/decisiontable/Test.java)
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/decisiontable/Dummy.java	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/decisiontable/Dummy.java	2010-02-12 13:48:18 UTC (rev 31607)
@@ -0,0 +1,5 @@
+package org.test.decisiontable;
+
+public class Dummy {
+
+}

Deleted: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/decisiontable/Test.java
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/decisiontable/Test.java	2010-02-12 13:33:02 UTC (rev 31606)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/decisiontable/Test.java	2010-02-12 13:48:18 UTC (rev 31607)
@@ -1,5 +0,0 @@
-package org.test.decisiontable;
-
-public class Test {
-
-}

Modified: labs/jbossrules/trunk/bundle-repository/pom.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/pom.xml	2010-02-12 13:33:02 UTC (rev 31606)
+++ labs/jbossrules/trunk/bundle-repository/pom.xml	2010-02-12 13:48:18 UTC (rev 31607)
@@ -60,13 +60,14 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-dependency-plugin</artifactId>
+	        <inherited>false</inherited>
             <executions>
                <execution>
                   <id>copy-dependencies</id>
                   <phase>generate-resources</phase>
                   <goals>
                      <goal>copy-dependencies</goal>
-                  </goals>
+                  </goals>				   
                   <configuration>
                      <outputDirectory>plugins</outputDirectory>
                      <overWriteReleases>true</overWriteReleases>