JBoss-OSGI SVN: r101323 - projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-remote.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-23 04:16:19 -0500 (Tue, 23 Feb 2010)
New Revision: 101323
Modified:
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-remote/config.xml
Log:
Fix framework config
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-remote/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-remote/config.xml 2010-02-23 08:47:20 UTC (rev 101322)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-remote/config.xml 2010-02-23 09:16:19 UTC (rev 101323)
@@ -32,12 +32,6 @@
</triggers>
<axes>
<axis>
- <name>framework</name>
- <values>
- <string>equinox</string>
- </values>
- </axis>
- <axis>
<name>container</name>
<values>
<string>runtime</string>
14 years, 3 months
JBoss-OSGI SVN: r101320 - projects/jboss-osgi/trunk/hudson/hudson-home.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-23 02:56:34 -0500 (Tue, 23 Feb 2010)
New Revision: 101320
Modified:
projects/jboss-osgi/trunk/hudson/hudson-home/command.sh
Log:
Use jboss-6.0.0.20100216-M2
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/command.sh 2010-02-23 07:50:28 UTC (rev 101319)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/command.sh 2010-02-23 07:56:34 UTC (rev 101320)
@@ -33,7 +33,7 @@
SERVER_NAME=default
JBOSS_BUILD=jboss-6.0.0.M2
JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_BUILD.zip
- RUNTIME_HOME=$WORKSPACE/$JBOSS_BUILD
+ RUNTIME_HOME=$WORKSPACE/jboss-6.0.0.20100216-M2
RUNTIME_LOG=$RUNTIME_HOME/server/$SERVER_NAME/log/server.log
rm -rf $RUNTIME_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
cp --backup $HUDSONBIN/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
14 years, 3 months
JBoss-OSGI SVN: r101318 - in projects/jboss-osgi/trunk/hudson: hudson-home and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-23 02:31:39 -0500 (Tue, 23 Feb 2010)
New Revision: 101318
Added:
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-remote/
Removed:
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-jdk15/
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/
Modified:
projects/jboss-osgi/trunk/hudson/build.xml
projects/jboss-osgi/trunk/hudson/hudson-home/command.sh
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-remote/config.xml
Log:
Update jboss600 to 6.0.0.M2
Modified: projects/jboss-osgi/trunk/hudson/build.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/build.xml 2010-02-23 06:51:35 UTC (rev 101317)
+++ projects/jboss-osgi/trunk/hudson/build.xml 2010-02-23 07:31:39 UTC (rev 101318)
@@ -82,7 +82,7 @@
<available property="sun.hudson.available" file="${thirdparty.dir}/hudson.war"/>
<available property="jboss501.available" file="${thirdparty.dir}/jboss-5.0.1.GA.zip"/>
<available property="jboss510.available" file="${thirdparty.dir}/jboss-5.1.0.GA.zip"/>
- <available property="jboss600.available" file="${thirdparty.dir}/jboss-6.0.0.M1.zip"/>
+ <available property="jboss600.available" file="${thirdparty.dir}/jboss-6.0.0.M2.zip"/>
</target>
<!--
@@ -91,7 +91,7 @@
<target name="thirdparty" depends="init-thirdparty,get-tomcat,get-hudson,get-jboss501,get-jboss510,get-jboss600">
<copy todir="${hudson.root}/jboss" file="${thirdparty.dir}/jboss-5.0.1.GA.zip"/>
<copy todir="${hudson.root}/jboss" file="${thirdparty.dir}/jboss-5.1.0.GA.zip"/>
- <copy todir="${hudson.root}/jboss" file="${thirdparty.dir}/jboss-6.0.0.M1.zip"/>
+ <copy todir="${hudson.root}/jboss" file="${thirdparty.dir}/jboss-6.0.0.M2.zip"/>
</target>
<target name="get-tomcat" depends="init-thirdparty" unless="apache.tomcat.available">
<get src="http://www.apache.org/dist/tomcat/tomcat-5/v${apache-tomcat}/bin/apache-t..." dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/>
@@ -108,8 +108,8 @@
<get src="${hudson.jboss510.zip}" dest="${thirdparty.dir}/jboss-5.1.0.GA.zip" usetimestamp="true" verbose="true"/>
</target>
<target name="get-jboss600" depends="init-thirdparty" unless="jboss600.available">
- <property name="hudson.jboss600.zip" value="http://downloads.sourceforge.net/jboss/jboss-6.0.0.M1.zip"/>
- <get src="${hudson.jboss600.zip}" dest="${thirdparty.dir}/jboss-6.0.0.M1.zip" usetimestamp="true" verbose="true"/>
+ <property name="hudson.jboss600.zip" value="http://downloads.sourceforge.net/jboss/jboss-6.0.0.M2.zip"/>
+ <get src="${hudson.jboss600.zip}" dest="${thirdparty.dir}/jboss-6.0.0.M2.zip" usetimestamp="true" verbose="true"/>
</target>
<!--
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/command.sh 2010-02-23 06:51:35 UTC (rev 101317)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/command.sh 2010-02-23 07:31:39 UTC (rev 101318)
@@ -31,7 +31,7 @@
;;
'jboss600')
SERVER_NAME=default
- JBOSS_BUILD=jboss-6.0.0.M1
+ JBOSS_BUILD=jboss-6.0.0.M2
JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_BUILD.zip
RUNTIME_HOME=$WORKSPACE/$JBOSS_BUILD
RUNTIME_LOG=$RUNTIME_HOME/server/$SERVER_NAME/log/server.log
Copied: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-remote (from rev 101317, projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox)
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-remote/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml 2010-02-23 06:51:35 UTC (rev 101317)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-remote/config.xml 2010-02-23 07:31:39 UTC (rev 101318)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<matrix-project>
<actions class="java.util.concurrent.CopyOnWriteArrayList"/>
- <description>Build and test the JBossOSGi @version.id@ Matrix with Equinox</description>
+ <description>Build and test the JBossOSGi @version.id@ Remote Matrix</description>
<logRotator>
<daysToKeep>60</daysToKeep>
<numToKeep>-1</numToKeep>
@@ -48,14 +48,16 @@
</values>
</axis>
<axis>
- <name>jdk</name>
+ <name>framework</name>
<values>
- <string>jdk1.6</string>
- <string>jdk1.5</string>
+ <string>equinox</string>
+ <string>felix</string>
+ <string>jbossmc</string>
</values>
</axis>
</axes>
- <combinationFilter>!((container=='jboss600' || container=='jboss601') && jdk=='jdk1.5')</combinationFilter>
+ <combinationFilter>!((container=='jboss501' || container=='jboss510') && framework=='jbossmc')</combinationFilter>
+ <jdk>jdk1.6</jdk>
<builders>
<hudson.tasks.Shell>
<command>
14 years, 3 months
JBoss-OSGI SVN: r101182 - projects/jboss-osgi/trunk/distribution.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-19 14:09:45 -0500 (Fri, 19 Feb 2010)
New Revision: 101182
Modified:
projects/jboss-osgi/trunk/distribution/pom.xml
Log:
temporary fix installer build by exluding jmx/jndi javadoc
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-19 19:02:27 UTC (rev 101181)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-19 19:09:45 UTC (rev 101182)
@@ -207,12 +207,14 @@
<version>${version.jboss.osgi.jmx}</version>
<classifier>sources</classifier>
</dependency>
+ <!--
<dependency>
<groupId>org.jboss.osgi.jmx</groupId>
<artifactId>jboss-osgi-jmx</artifactId>
<version>${version.jboss.osgi.jmx}</version>
<classifier>javadoc</classifier>
</dependency>
+ -->
<dependency>
<groupId>org.jboss.osgi.jndi</groupId>
<artifactId>jboss-osgi-jndi</artifactId>
@@ -223,12 +225,14 @@
<version>${version.jboss.osgi.jndi}</version>
<classifier>sources</classifier>
</dependency>
+ <!--
<dependency>
<groupId>org.jboss.osgi.jndi</groupId>
<artifactId>jboss-osgi-jndi</artifactId>
<version>${version.jboss.osgi.jndi}</version>
<classifier>javadoc</classifier>
</dependency>
+ -->
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jta</artifactId>
14 years, 4 months
JBoss-OSGI SVN: r101172 - in projects/jboss-osgi/projects/testing/trunk: .settings and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-19 10:21:39 -0500 (Fri, 19 Feb 2010)
New Revision: 101172
Removed:
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/husky/
Modified:
projects/jboss-osgi/projects/testing/trunk/.classpath
projects/jboss-osgi/projects/testing/trunk/.settings/org.eclipse.jdt.core.prefs
Log:
switch to jdk1.6
Modified: projects/jboss-osgi/projects/testing/trunk/.classpath
===================================================================
--- projects/jboss-osgi/projects/testing/trunk/.classpath 2010-02-19 15:19:31 UTC (rev 101171)
+++ projects/jboss-osgi/projects/testing/trunk/.classpath 2010-02-19 15:21:39 UTC (rev 101172)
@@ -3,7 +3,7 @@
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/jboss-osgi/projects/testing/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/testing/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-19 15:19:31 UTC (rev 101171)
+++ projects/jboss-osgi/projects/testing/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-19 15:21:39 UTC (rev 101172)
@@ -1,6 +1,13 @@
-#Fri Feb 19 12:59:05 CET 2010
+#Fri Feb 19 16:20:59 CET 2010
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
14 years, 4 months
JBoss-OSGI SVN: r101171 - in projects/jboss-osgi/projects/bundles/jndi/trunk: jndi-api and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-19 10:19:31 -0500 (Fri, 19 Feb 2010)
New Revision: 101171
Modified:
projects/jboss-osgi/projects/bundles/jndi/trunk/.classpath
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.classpath
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.classpath
Log:
Fix eclipse build
Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/.classpath
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/.classpath 2010-02-19 15:18:34 UTC (rev 101170)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/.classpath 2010-02-19 15:19:31 UTC (rev 101171)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.classpath
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.classpath 2010-02-19 15:18:34 UTC (rev 101170)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.classpath 2010-02-19 15:19:31 UTC (rev 101171)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.classpath
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.classpath 2010-02-19 15:18:34 UTC (rev 101170)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.classpath 2010-02-19 15:19:31 UTC (rev 101171)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
14 years, 4 months
JBoss-OSGI SVN: r101170 - in projects/jboss-osgi/projects/bundles/jndi/trunk: jndi-api and 3 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-19 10:18:34 -0500 (Fri, 19 Feb 2010)
New Revision: 101170
Added:
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.classpath
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.project
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.settings/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.settings/org.maven.ide.eclipse.prefs
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.classpath
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.project
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.settings/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.settings/org.maven.ide.eclipse.prefs
Modified:
projects/jboss-osgi/projects/bundles/jndi/trunk/.classpath
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/
Log:
Fix eclipse build
Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/.classpath
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/.classpath 2010-02-19 15:15:57 UTC (rev 101169)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/.classpath 2010-02-19 15:18:34 UTC (rev 101170)
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Property changes on: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api
___________________________________________________________________
Name: svn:ignore
+ target
Added: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.classpath
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.classpath (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.classpath 2010-02-19 15:18:34 UTC (rev 101170)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.project
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.project (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.project 2010-02-19 15:18:34 UTC (rev 101170)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-osgi-jndi</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.settings/org.eclipse.jdt.core.prefs 2010-02-19 15:18:34 UTC (rev 101170)
@@ -0,0 +1,6 @@
+#Fri Feb 19 14:29:59 CET 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
Added: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/.settings/org.maven.ide.eclipse.prefs 2010-02-19 15:18:34 UTC (rev 101170)
@@ -0,0 +1,9 @@
+#Fri Feb 19 14:29:58 CET 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Property changes on: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle
___________________________________________________________________
Name: svn:ignore
+ target
Added: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.classpath
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.classpath (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.classpath 2010-02-19 15:18:34 UTC (rev 101170)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.project
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.project (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.project 2010-02-19 15:18:34 UTC (rev 101170)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-osgi-jndi</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.settings/org.eclipse.jdt.core.prefs 2010-02-19 15:18:34 UTC (rev 101170)
@@ -0,0 +1,6 @@
+#Fri Feb 19 14:37:55 CET 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
Added: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/.settings/org.maven.ide.eclipse.prefs 2010-02-19 15:18:34 UTC (rev 101170)
@@ -0,0 +1,9 @@
+#Fri Feb 19 14:37:54 CET 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
14 years, 4 months
JBoss-OSGI SVN: r101169 - in projects/jboss-osgi/trunk: distribution and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-19 10:15:57 -0500 (Fri, 19 Feb 2010)
New Revision: 101169
Modified:
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
slpit up jmx/jndi into modules
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-19 15:04:13 UTC (rev 101168)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-19 15:15:57 UTC (rev 101169)
@@ -198,33 +198,33 @@
<classifier>javadoc</classifier>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi.jmx</groupId>
<artifactId>jboss-osgi-jmx</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi.jmx</groupId>
<artifactId>jboss-osgi-jmx</artifactId>
<version>${version.jboss.osgi.jmx}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi.jmx</groupId>
<artifactId>jboss-osgi-jmx</artifactId>
<version>${version.jboss.osgi.jmx}</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi.jndi</groupId>
<artifactId>jboss-osgi-jndi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi.jndi</groupId>
<artifactId>jboss-osgi-jndi</artifactId>
<version>${version.jboss.osgi.jndi}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi.jndi</groupId>
<artifactId>jboss-osgi-jndi</artifactId>
<version>${version.jboss.osgi.jndi}</version>
<classifier>javadoc</classifier>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-02-19 15:04:13 UTC (rev 101168)
+++ projects/jboss-osgi/trunk/pom.xml 2010-02-19 15:15:57 UTC (rev 101169)
@@ -168,12 +168,12 @@
<version>${version.jboss.osgi.jaxb}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi.jmx</groupId>
<artifactId>jboss-osgi-jmx</artifactId>
<version>${version.jboss.osgi.jmx}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi.jndi</groupId>
<artifactId>jboss-osgi-jndi</artifactId>
<version>${version.jboss.osgi.jndi}</version>
</dependency>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-19 15:04:13 UTC (rev 101168)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-19 15:15:57 UTC (rev 101169)
@@ -169,12 +169,12 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi.jmx</groupId>
<artifactId>jboss-osgi-jmx</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi.jndi</groupId>
<artifactId>jboss-osgi-jndi</artifactId>
<scope>provided</scope>
</dependency>
14 years, 4 months
JBoss-OSGI SVN: r101168 - in projects/jboss-osgi/projects/bundles/jmx/trunk: jmx-api and 6 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-19 10:04:13 -0500 (Fri, 19 Feb 2010)
New Revision: 101168
Added:
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/
Removed:
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/internal/
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/osgi/
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/Constants.java
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/osgi/
Modified:
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.classpath
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml
projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
Log:
slpit jmx into modules
Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api (from rev 101161, projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle)
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.classpath
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/.classpath 2010-02-19 12:57:10 UTC (rev 101161)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.classpath 2010-02-19 15:04:13 UTC (rev 101168)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/.settings/org.eclipse.jdt.core.prefs 2010-02-19 12:57:10 UTC (rev 101161)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.settings/org.eclipse.jdt.core.prefs 2010-02-19 15:04:13 UTC (rev 101168)
@@ -1,13 +1,6 @@
-#Fri Feb 19 13:54:44 CET 2010
+#Fri Feb 19 14:10:33 CET 2010
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.5
Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml 2010-02-19 12:57:10 UTC (rev 101161)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml 2010-02-19 15:04:13 UTC (rev 101168)
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
- <!-- ====================================================================== -->
- <!-- -->
- <!-- JBoss, the OpenSource J2EE webOS -->
- <!-- -->
- <!-- Distributable under LGPL license. -->
- <!-- See terms of license at http://www.gnu.org. -->
- <!-- -->
- <!-- ====================================================================== -->
-
- <!-- $Id$ -->
-
-<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>
-
- <name>JBossOSGi - JMX Bundle</name>
- <description>The JBossOSGi Management</description>
-
- <groupId>org.jboss.osgi.jmx</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
- <packaging>bundle</packaging>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.osgi.jmx</groupId>
- <artifactId>jboss-osgi-jmx-parent</artifactId>
- <version>1.0.4-SNAPSHOT</version>
- </parent>
-
- <!-- Dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx.api</artifactId>
- </dependency>
-
- <!-- OSGi Dependencies -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Bundle-Activator>org.jboss.osgi.jmx.internal.JMXServiceActivator</Bundle-Activator>
- <Export-Package>
- org.jboss.osgi.jmx;version=${version}
- </Export-Package>
- <Import-Package>
-
- <!-- system -->
- javax.management*,
- javax.naming,
- javax.naming.spi,
-
- <!-- jboss-osgi -->
- org.jboss.osgi.spi*;version="[1.0,2.0)",
-
- <!-- osgi -->
- org.osgi.framework;version="[1.5,2.0)",
- org.osgi.service.packageadmin;version="[1.2,2.0)",
- org.osgi.util.tracker;version="[1.4,2.0)",
-
- <!-- FIXME: make optional
- org.jboss.osgi.jndi;resolution:=optional,
- org.jboss.net.sockets;resolution:=optional,
- org.jnp.interfaces;resolution:=optional,
- -->
- org.jboss.osgi.jndi;version="[1.0,2.0)",
- org.jboss.net.sockets;version="[2.2,3.0)",
- org.jnp.interfaces;version="[5.0,6.0)",
-
- </Import-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <!-- For some reason the distribution javadoc module needs this -->
- <file>target/${artifactId}-${version}-sources.jar</file>
- <classifier>sources</classifier>
- <type>jar</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml (from rev 101160, projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml)
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml (rev 0)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml 2010-02-19 15:04:13 UTC (rev 101168)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
+
+ <!-- $Id$ -->
+
+<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>
+
+ <name>JBossOSGi - JMX API</name>
+ <description>The JBossOSGi Management</description>
+
+ <groupId>org.jboss.osgi.jmx</groupId>
+ <artifactId>jboss-osgi-jmx-api</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi.jmx</groupId>
+ <artifactId>jboss-osgi-jmx-parent</artifactId>
+ <version>1.0.4-SNAPSHOT</version>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.api</artifactId>
+ </dependency>
+
+ <!-- OSGi Dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ </plugins>
+ </build>
+
+</project>
Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src (from rev 101160, projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src)
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml 2010-02-19 14:57:28 UTC (rev 101167)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml 2010-02-19 15:04:13 UTC (rev 101168)
@@ -31,12 +31,17 @@
<!-- Dependencies -->
<dependencies>
<dependency>
+ <groupId>org.jboss.osgi.jmx</groupId>
+ <artifactId>jboss-osgi-jmx-api</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
@@ -76,8 +81,13 @@
javax.naming,
javax.naming.spi,
+ <!-- logging -->
+ org.jboss.logging;version="[2.1,3.0)",
+
<!-- jboss-osgi -->
org.jboss.osgi.spi*;version="[1.0,2.0)",
+ org.jboss.osgi.jmx;version="[1.0,2.0)",
+ org.jboss.osgi.jndi;version="[1.0,2.0)",
<!-- osgi -->
org.osgi.framework;version="[1.5,2.0)",
@@ -89,12 +99,17 @@
org.jboss.net.sockets;resolution:=optional,
org.jnp.interfaces;resolution:=optional,
-->
- org.jboss.osgi.jndi;version="[1.0,2.0)",
org.jboss.net.sockets;version="[2.2,3.0)",
org.jnp.interfaces;version="[5.0,6.0)",
</Import-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
+ <Embed-Dependency>
+ jboss-osgi-jmx-api;inline=false
+ </Embed-Dependency>
+ <_exportcontents>
+ org.jboss.osgi.jmx;version=${version}
+ </_exportcontents>
+ <!-- DynamicImport-Package>*</DynamicImport-Package -->
</instructions>
</configuration>
</plugin>
Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/Constants.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/Constants.java 2010-02-19 14:57:28 UTC (rev 101167)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/Constants.java 2010-02-19 15:04:13 UTC (rev 101168)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.jmx;
-
-//$Id$
-
-/**
- * The JMX service contants
- *
- * @author thomas.diesler(a)jboss.com
- * @since 24-Apr-2009
- */
-public interface Constants
-{
- /** The property that sets the host that the RMIAdaptor binds to: org.jboss.osgi.jmx.host */
- String REMOTE_JMX_HOST = "org.jboss.osgi.jmx.host";
- /** The property that sets the port that the RMIAdaptor binds to: org.jboss.osgi.jmx.port */
- String REMOTE_JMX_RMI_PORT = "org.jboss.osgi.jmx.rmi.port";
- /** The property that sets the JNDI name the RMIAdaptor binds to: org.jboss.osgi.jmx.rmi.adaptor */
- String REMOTE_JMX_RMI_ADAPTOR = "org.jboss.osgi.jmx.rmi.adaptor";
-}
\ No newline at end of file
Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java 2010-02-19 14:57:28 UTC (rev 101167)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java 2010-02-19 15:04:13 UTC (rev 101168)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.jmx;
-
-//$Id$
-
-import javax.management.MBeanServer;
-
-import org.jboss.osgi.jndi.JNDICapability;
-import org.jboss.osgi.spi.capability.Capability;
-
-/**
- * Adds the JMX capability to the {@link OSGiRuntime}
- * under test.
- *
- * It is ignored if the {@link MBeanServer} is already registered.
- *
- * Dependent Capability: {@link JNDICapability}
- * Installed bundles: jboss-osgi-jmx.jar
- *
- * Default properties set by this capability
- *
- * <table>
- * <tr><th>Property</th><th>Value</th></tr>
- * <tr><td>org.jboss.osgi.jmx.host</td><td>${jboss.bind.address}</td></tr>
- * <tr><td>org.jboss.osgi.jmx.rmi.port</td><td>1198</td></tr>
- * </table>
- *
- * @author thomas.diesler(a)jboss.com
- * @since 05-May-2009
- */
-public class JMXCapability extends Capability
-{
- public JMXCapability()
- {
- super(MBeanServer.class.getName());
-
- addSystemProperty("org.jboss.osgi.jmx.host", System.getProperty("jboss.bind.address", "localhost"));
- addSystemProperty("org.jboss.osgi.jmx.rmi.port", "1198");
-
- addDependency(new JNDICapability());
-
- addBundle("bundles/jboss-osgi-jmx.jar");
- addBundle("bundles/org.apache.aries.jmx.jar");
- }
-}
\ No newline at end of file
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2010-02-19 14:57:28 UTC (rev 101167)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2010-02-19 15:04:13 UTC (rev 101168)
@@ -42,10 +42,12 @@
<version.apache.aries.jmx>1.0.0-incubating-SNAPSHOT</version.apache.aries.jmx>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
<version.jboss.osgi.jndi>1.0.3-SNAPSHOT</version.jboss.osgi.jndi>
+ <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.osgi>4.2.0</version.osgi>
</properties>
<modules>
+ <module>jmx-api</module>
<module>jmx-bundle</module>
</modules>
@@ -53,13 +55,18 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common-core</artifactId>
<version>${version.jboss.osgi.common.core}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi-api</artifactId>
<version>${version.jboss.osgi.jndi}</version>
</dependency>
<dependency>
14 years, 4 months
JBoss-OSGI SVN: r101167 - in projects/jboss-osgi/projects/bundles/jndi/trunk: .settings and 11 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-19 09:57:28 -0500 (Fri, 19 Feb 2010)
New Revision: 101167
Added:
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/pom.xml
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/Constants.java
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/JNDICapability.java
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/resources/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/resources/jnp.properties
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/pom.xml
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/src/
Removed:
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/src/main/java/org/jboss/osgi/jndi/Constants.java
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/src/main/java/org/jboss/osgi/jndi/JNDICapability.java
projects/jboss-osgi/projects/bundles/jndi/trunk/src/
Modified:
projects/jboss-osgi/projects/bundles/jndi/trunk/.classpath
projects/jboss-osgi/projects/bundles/jndi/trunk/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml
Log:
split jndi into modules
Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/.classpath
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/.classpath 2010-02-19 14:56:59 UTC (rev 101166)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/.classpath 2010-02-19 14:57:28 UTC (rev 101167)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-19 14:56:59 UTC (rev 101166)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-19 14:57:28 UTC (rev 101167)
@@ -1,12 +1,6 @@
-#Wed Feb 17 12:16:11 CET 2010
+#Fri Feb 19 14:23:19 CET 2010
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.5
Added: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/pom.xml (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/pom.xml 2010-02-19 14:57:28 UTC (rev 101167)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
+
+ <!-- $Id$ -->
+
+<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>
+
+ <name>JBossOSGi - JNDI API</name>
+ <description>The JBossOSGi Naming Service</description>
+
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi-api</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi-parent</artifactId>
+ <version>1.0.3-SNAPSHOT</version>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ </dependency>
+
+ <!-- OSGi Dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Property changes on: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/Constants.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/Constants.java (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/Constants.java 2010-02-19 14:57:28 UTC (rev 101167)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.jndi;
+
+//$Id$
+
+/**
+ * The JNDI service contants
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 24-Apr-2009
+ */
+public interface Constants
+{
+ /** The property that sets the naming server host: org.jboss.osgi.jndi.host */
+ String REMOTE_JNDI_HOST = "org.jboss.osgi.jndi.host";
+ /** The property that sets the naming server RMI port: org.jboss.osgi.jndi.rmi.port */
+ String REMOTE_JNDI_RMI_PORT = "org.jboss.osgi.jndi.rmi.port";
+ /** The property that sets the naming server port: org.jboss.osgi.jndi.port */
+ String REMOTE_JNDI_PORT = "org.jboss.osgi.jndi.port";
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/Constants.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/JNDICapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/JNDICapability.java (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/JNDICapability.java 2010-02-19 14:57:28 UTC (rev 101167)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.jndi;
+
+//$Id$
+
+import javax.naming.InitialContext;
+
+import org.jboss.osgi.spi.capability.Capability;
+
+/**
+ * Adds the JNDI capability to the OSGiRuntime under test.
+ *
+ * It is ignored if the {@link InitialContext} is already registered.
+ *
+ * Installed bundles: jboss-osgi-common-core.jar, jboss-osgi-jndi.jar
+ *
+ * Default properties set by this capability
+ *
+ * <table>
+ * <tr><th>Property</th><th>Value</th></tr>
+ * <tr><td>org.jboss.osgi.jndi.host</td><td>${jboss.bind.address}</td></tr>
+ * <tr><td>org.jboss.osgi.jndi.rmi.port</td><td>1198</td></tr>
+ * <tr><td>org.jboss.osgi.jndi.port</td><td>1199</td></tr>
+ * </table>
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 05-May-2009
+ */
+public class JNDICapability extends Capability
+{
+ public JNDICapability()
+ {
+ super(InitialContext.class.getName());
+
+ addSystemProperty("org.jboss.osgi.jndi.host", System.getProperty("jboss.bind.address", "localhost"));
+ addSystemProperty("org.jboss.osgi.jndi.rmi.port", "1198");
+ addSystemProperty("org.jboss.osgi.jndi.port", "1199");
+
+ addBundle("bundles/jboss-osgi-common-core.jar");
+ addBundle("bundles/jboss-osgi-jndi.jar");
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/java/org/jboss/osgi/jndi/JNDICapability.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/resources/jnp.properties
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/resources/jnp.properties (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-api/src/main/resources/jnp.properties 2010-02-19 14:57:28 UTC (rev 101167)
@@ -0,0 +1 @@
+# Intentionally left empty
\ No newline at end of file
Copied: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/pom.xml (from rev 101118, projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml)
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/pom.xml (rev 0)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/pom.xml 2010-02-19 14:57:28 UTC (rev 101167)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
+
+ <!-- $Id$ -->
+
+<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>
+
+ <name>JBossOSGi - JNDI Bundle</name>
+ <description>The JBossOSGi Naming Service</description>
+
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi</artifactId>
+ <packaging>bundle</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi-parent</artifactId>
+ <version>1.0.3-SNAPSHOT</version>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi-api</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ </dependency>
+
+ <!-- Provided Dependencies -->
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- OSGi Dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-Activator>org.jboss.osgi.jndi.internal.JNDIServiceActivator</Bundle-Activator>
+ <Import-Package>
+
+ <!-- system -->
+ javax.naming*,
+ javax.net,
+
+ <!-- jboss -->
+ org.jboss.logging;version="[2.1,3.0)",
+ org.jboss.net.sockets;version="[2.2,3.0)",
+ org.jboss.util.naming;version="[2.2,3.0)",
+ org.jboss.util.threadpool;version="[2.2,3.0)",
+ org.jnp.interfaces;version="[5.0,6.0)",
+
+ <!-- jboss-osgi -->
+ org.jboss.osgi.jndi;version="[1.0,2.0)",
+ org.jboss.osgi.spi*;version="[1.0,2.0)",
+
+ <!-- osgi -->
+ org.osgi.framework;version="[1.5,2.0)",
+ </Import-Package>
+ <Embed-Dependency>
+ jnpserver;inline=false,
+ jboss-osgi-jndi-api;inline=false
+ </Embed-Dependency>
+ <_exportcontents>
+ org.jnp.interfaces;version=5.0.1,
+ org.jboss.osgi.jndi;version=${version}
+ </_exportcontents>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Copied: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/src (from rev 101114, projects/jboss-osgi/projects/bundles/jndi/trunk/src)
Deleted: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/src/main/java/org/jboss/osgi/jndi/Constants.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/Constants.java 2010-02-18 14:18:48 UTC (rev 101114)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/src/main/java/org/jboss/osgi/jndi/Constants.java 2010-02-19 14:57:28 UTC (rev 101167)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.jndi;
-
-//$Id$
-
-/**
- * The JNDI service contants
- *
- * @author thomas.diesler(a)jboss.com
- * @since 24-Apr-2009
- */
-public interface Constants
-{
- /** The property that sets the naming server host: org.jboss.osgi.jndi.host */
- String REMOTE_JNDI_HOST = "org.jboss.osgi.jndi.host";
- /** The property that sets the naming server RMI port: org.jboss.osgi.jndi.rmi.port */
- String REMOTE_JNDI_RMI_PORT = "org.jboss.osgi.jndi.rmi.port";
- /** The property that sets the naming server port: org.jboss.osgi.jndi.port */
- String REMOTE_JNDI_PORT = "org.jboss.osgi.jndi.port";
-}
\ No newline at end of file
Deleted: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/src/main/java/org/jboss/osgi/jndi/JNDICapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/JNDICapability.java 2010-02-18 14:18:48 UTC (rev 101114)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/src/main/java/org/jboss/osgi/jndi/JNDICapability.java 2010-02-19 14:57:28 UTC (rev 101167)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.jndi;
-
-//$Id$
-
-import javax.naming.InitialContext;
-
-import org.jboss.osgi.common.log.LoggingCapability;
-import org.jboss.osgi.spi.capability.Capability;
-
-/**
- * Adds the JNDI capability to the {@link OSGiRuntime}
- * under test.
- *
- * It is ignored if the {@link InitialContext} is already registered.
- *
- * Installed bundles: jboss-osgi-common-core.jar, jboss-osgi-jndi.jar
- *
- * Default properties set by this capability
- *
- * <table>
- * <tr><th>Property</th><th>Value</th></tr>
- * <tr><td>org.jboss.osgi.jndi.host</td><td>${jboss.bind.address}</td></tr>
- * <tr><td>org.jboss.osgi.jndi.rmi.port</td><td>1198</td></tr>
- * <tr><td>org.jboss.osgi.jndi.port</td><td>1199</td></tr>
- * </table>
- *
- * @author thomas.diesler(a)jboss.com
- * @since 05-May-2009
- */
-public class JNDICapability extends Capability
-{
- public JNDICapability()
- {
- super(InitialContext.class.getName());
-
- addSystemProperty("org.jboss.osgi.jndi.host", System.getProperty("jboss.bind.address", "localhost"));
- addSystemProperty("org.jboss.osgi.jndi.rmi.port", "1198");
- addSystemProperty("org.jboss.osgi.jndi.port", "1199");
-
- addDependency(new LoggingCapability());
-
- addBundle("bundles/jboss-osgi-common-core.jar");
- addBundle("bundles/jboss-osgi-jndi.jar");
- }
-}
\ No newline at end of file
Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2010-02-19 14:56:59 UTC (rev 101166)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2010-02-19 14:57:28 UTC (rev 101167)
@@ -14,12 +14,12 @@
<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>
- <name>JBossOSGi Bundles - JNDI</name>
+ <name>JBossOSGi - JNDI</name>
<description>The JBossOSGi Naming Service</description>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
- <packaging>bundle</packaging>
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi-parent</artifactId>
+ <packaging>pom</packaging>
<version>1.0.3-SNAPSHOT</version>
@@ -30,6 +30,19 @@
<version>1.0.5-SNAPSHOT</version>
</parent>
+ <!-- Subversion -->
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection>
+ <url>http://fisheye.jboss.com/qsearch/JBossOSGi/projects/bundles/jndi/trunk</url>
+ </scm>
+
+ <!-- Modules -->
+ <modules>
+ <module>jndi-api</module>
+ <module>jndi-bundle</module>
+ </modules>
+
<!-- Properties -->
<properties>
<version.jboss.naming>5.0.1.GA</version.jboss.naming>
@@ -39,92 +52,38 @@
</properties>
<!-- Dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
- </dependency>
-
- <!-- Provided Dependencies -->
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnpserver</artifactId>
- <version>${version.jboss.naming}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- OSGi Dependencies -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
+ </dependency>
+
+ <!-- Provided Dependencies -->
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ <version>${version.jboss.naming}</version>
+ </dependency>
+
+ <!-- OSGi Dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Bundle-Activator>org.jboss.osgi.jndi.internal.JNDIServiceActivator</Bundle-Activator>
- <Export-Package>
- org.jboss.osgi.jndi;version=${version}
- </Export-Package>
- <Import-Package>
-
- <!-- system -->
- javax.naming*,
- javax.net,
-
- <!-- jboss -->
- org.jboss.logging;version="[2.1,3.0)",
- org.jboss.net.sockets;version="[2.2,3.0)",
- org.jboss.util.naming;version="[2.2,3.0)",
- org.jboss.util.threadpool;version="[2.2,3.0)",
- org.jnp.interfaces;version="[5.0,6.0)",
-
- <!-- jboss-osgi -->
- org.jboss.osgi.common*;version="[1.0,2.0)",
- org.jboss.osgi.spi*;version="[1.0,2.0)",
-
- <!-- osgi -->
- org.osgi.framework;version="[1.5,2.0)",
-
- </Import-Package>
- <Embed-Dependency>
- jnpserver;inline=false
- </Embed-Dependency>
- <_exportcontents>
- org.jnp.interfaces;version=5.0.1
- </_exportcontents>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <!-- Subversion -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection>
- <url>http://fisheye.jboss.com/qsearch/JBossOSGi/projects/bundles/jndi/trunk</url>
- </scm>
-
</project>
14 years, 4 months