[jboss-cvs] JBossAS SVN: r100663 - in projects/jboss-osgi/branches/1.0.0.Beta6: distribution/installer/src/main/resources/installer and 3 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2010-02-07 07:10:17 -0500 (Sun, 07 Feb 2010)
New Revision: 100663

Added:
   projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/jbossas/jboss600/
Modified:
   projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/branches/1.0.0.Beta6/pom.xml
   projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/pom.xml
   projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/pom.xml
Log:
Add more trace logging

Modified: projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/installer/install-definition.xml	2010-02-07 04:23:33 UTC (rev 100662)
+++ projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/installer/install-definition.xml	2010-02-07 12:10:17 UTC (rev 100663)
@@ -385,6 +385,11 @@
         <include name="war-deployers-jboss-beans.xml" />
       </fileset>
 
+      <fileset condition="isJBoss601" dir="@{deploy.artifacts.dir}/resources/jbossas/jboss600" 
+        targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy" override="true">
+        <include name="jboss-logging.xml" />
+      </fileset>
+      
       <!-- deployers/osgi.deployer -->
       <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
         <include name="jboss-osgi-deployers.jar" />

Modified: projects/jboss-osgi/branches/1.0.0.Beta6/pom.xml
===================================================================
--- projects/jboss-osgi/branches/1.0.0.Beta6/pom.xml	2010-02-07 04:23:33 UTC (rev 100662)
+++ projects/jboss-osgi/branches/1.0.0.Beta6/pom.xml	2010-02-07 12:10:17 UTC (rev 100663)
@@ -60,9 +60,9 @@
     <version.jboss.osgi.deployment>1.0.1</version.jboss.osgi.deployment>
     <version.jboss.osgi.framework>1.0.0.Alpha3</version.jboss.osgi.framework>
     <version.jboss.osgi.hotdeploy>1.0.4</version.jboss.osgi.hotdeploy>
-    <version.jboss.osgi.husky>1.0.3</version.jboss.osgi.husky>
+    <version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky>
     <version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb>
-    <version.jboss.osgi.jmx>1.0.3</version.jboss.osgi.jmx>
+    <version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx>
     <version.jboss.osgi.jndi>1.0.2</version.jboss.osgi.jndi>
     <version.jboss.osgi.jta>1.0.0</version.jboss.osgi.jta>
     <version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect>
@@ -71,7 +71,7 @@
     <version.jboss.osgi.runtime.felix>2.0.2</version.jboss.osgi.runtime.felix>
     <version.jboss.osgi.runtime.jbossas>1.0.2</version.jboss.osgi.runtime.jbossas>
     <version.jboss.osgi.serviceloader>1.0.0</version.jboss.osgi.serviceloader>
-    <version.jboss.osgi.spi>1.0.4</version.jboss.osgi.spi>
+    <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
     <version.jboss.osgi.webapp>0.7.2.SP1</version.jboss.osgi.webapp>
     <version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>
     <version.jboss.osgi.xml.binding>2.0.2.Beta4</version.jboss.osgi.xml.binding>
@@ -423,7 +423,7 @@
                 </property>
                 <property>
                   <name>org.jboss.osgi.husky.Invoker</name>
-                  <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
+                  <value>org.jboss.osgi.husky.internal.AbstractInvoker</value>
                 </property>
                 <property>
                   <name>test.archive.directory</name>
@@ -471,7 +471,7 @@
                 </property>
                 <property>
                   <name>org.jboss.osgi.husky.Invoker</name>
-                  <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
+                  <value>org.jboss.osgi.husky.internal.AbstractInvoker</value>
                 </property>
                 <property>
                   <name>org.jboss.osgi.husky.runtime.connector.host</name>

Modified: projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/pom.xml	2010-02-07 04:23:33 UTC (rev 100662)
+++ projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/pom.xml	2010-02-07 12:10:17 UTC (rev 100663)
@@ -15,7 +15,7 @@
     Set these VM properties in your IDE debugger
      
       -Dlog4j.output.dir=${workspace_loc:jboss-osgi-testsuite-example/target}
-      -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.OSGiInvoker
+      -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.AbstractInvoker
       -Dtest.archive.directory=${workspace_loc:jboss-osgi-testsuite-example/target}/test-libs
   -->
 

Modified: projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/pom.xml	2010-02-07 04:23:33 UTC (rev 100662)
+++ projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/pom.xml	2010-02-07 12:10:17 UTC (rev 100663)
@@ -15,7 +15,7 @@
      Set these VM properties in your IDE debugger 
     
       -Dlog4j.output.dir=${workspace_loc:jboss-osgi-testsuite-functional/target}
-      -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.OSGiInvoker
+      -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.AbstractInvoker
       -Dtest.archive.directory=${workspace_loc:jboss-osgi-testsuite-functional/target}/test-libs
   -->