[jboss-cvs] JBossAS SVN: r108305 - in trunk: build and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 23 21:24:22 EDT 2010
Author: smcgowan at redhat.com
Date: 2010-09-23 21:24:21 -0400 (Thu, 23 Sep 2010)
New Revision: 108305
Removed:
trunk/osgi/
trunk/server/src/etc/conf/osgi/
trunk/testsuite/src/main/org/jboss/test/osgi/
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/depchain/pom.xml
trunk/pom.xml
trunk/server/src/etc/conf/all/bootstrap/deployers.xml
trunk/testsuite/build.xml
trunk/testsuite/imports/server-config.xml
trunk/testsuite/pom.xml
Log:
JBAS-8409 - remove osgi profile
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-09-23 19:41:04 UTC (rev 108304)
+++ trunk/build/build.xml 2010-09-24 01:24:21 UTC (rev 108305)
@@ -137,12 +137,6 @@
<property name="install.jbossweb.deployers" value="${install.jbossweb}/deployers"/>
<property name="install.jbossweb.conf" value="${install.jbossweb}/conf"/>
- <property name="install.osgi" value="${install.server}/osgi"/>
- <property name="install.osgi.lib" value="${install.osgi}/lib"/>
- <property name="install.osgi.deploy" value="${install.osgi}/deploy"/>
- <property name="install.osgi.deployers" value="${install.osgi}/deployers"/>
- <property name="install.osgi.conf" value="${install.osgi}/conf"/>
-
<property name="install.standard" value="${install.server}/standard"/>
<property name="install.standard.lib" value="${install.standard}/lib"/>
<property name="install.standard.deploy" value="${install.standard}/deploy"/>
@@ -203,7 +197,6 @@
module-tomcat,
module-webservices,
module-resteasy,
- module-osgi,
module-hibernate-int,
module-hornetq-int,
module-console">
@@ -232,14 +225,12 @@
<exclude name="work/**"/>
<exclude name="conf/jacorb.properties"/>
<exclude name="deployers/clustering-deployer-jboss-beans.xml"/>
- <exclude name="deployers/osgi.deployer/**"/>
<exclude name="deploy/cluster/**"/>
<exclude name="deploy/deploy.last/**"/>
<exclude name="deploy/httpha-invoker.sar/**"/>
<exclude name="deploy/iiop-jboss-beans.xml"/>
<exclude name="deploy/juddi-service.sar/**"/>
<exclude name="deploy/hornetq/**"/>
- <exclude name="deploy/osgi/**"/>
<exclude name="deploy/snmp-adaptor.sar/**"/>
</fileset>
</copy>
@@ -376,71 +367,6 @@
</fileset>
</copy>
- <!-- Build server/osgi manually -->
- <mkdir dir="${install.osgi}"/>
- <mkdir dir="${install.osgi.lib}"/>
- <copy todir="${install.osgi.conf}">
- <fileset dir="${install.default.conf}">
- <include name="**"/>
- </fileset>
- </copy>
- <copy todir="${install.osgi.deployers}">
- <fileset dir="${install.all.deployers}">
- <include name="jbossweb.deployer/**"/>
- <include name="jboss-threads.deployer/**"/>
- <include name="jboss-logging.deployer/**"/>
- <include name="alias-deployers-jboss-beans.xml"/>
- <include name="core-naming-jboss-beans.xml"/>
- <include name="metadata-deployer-jboss-beans.xml"/>
- <include name="scanning-deployers-jboss-beans.xml"/>
- <include name="security-deployer-jboss-beans.xml"/>
- <exclude name="jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml"/>
- </fileset>
- </copy>
- <copy todir="${install.osgi.deployers}/jbossweb.deployer/META-INF">
- <fileset dir="${tomcat.module.output}/resources/standalone">
- <include name="war-deployers-jboss-beans.xml"/>
- </fileset>
- </copy>
- <copy todir="${install.osgi.deploy}">
- <fileset dir="${install.all.deploy}">
- <include name="jbossweb.sar/**"/>
- <include name="ROOT.war/**"/>
- <include name="security/**"/>
- <include name="jboss-logging.xml"/>
- <include name="jmx-console-activator-jboss-beans.xml"/>
- <include name="jmx-jboss-beans.xml"/>
- <include name="naming-jboss-beans.xml"/>
- <include name="remoting-jboss-beans.xml"/>
- <include name="thread-pool-jboss-beans.xml"/>
- <include name="transaction-jboss-beans.xml"/>
- <include name="transaction-service.xml"/>
- <include name="legacy-conf-service.xml"/>
- <exclude name="jbossweb.sar/jstl.jar"/>
- <exclude name="jbossweb.sar/META-INF/jboss-structure.xml"/>
- <exclude name="jbossweb.sar/META-INF/jboss-beans.xml"/>
- <exclude name="jbossweb.sar/server.xml"/>
- <exclude name="jbossweb.sar/web.xml"/>
- </fileset>
- <fileset dir="${project.root}/profileservice/target/resources/">
- <include name="hdscanner-jboss-beans.xml"/>
- </fileset>
- </copy>
- <copy todir="${install.osgi.deploy}/jbossweb.sar/META-INF">
- <fileset dir="${tomcat.module.output}/resources">
- <include name="jboss-structure.xml"/>
- </fileset>
- <fileset dir="${tomcat.module.output}/resources/standalone">
- <include name="jboss-beans.xml"/>
- </fileset>
- </copy>
- <copy todir="${install.osgi.deploy}/jbossweb.sar">
- <fileset dir="${tomcat.module.output}/resources/standalone">
- <include name="server.xml"/>
- <include name="web.xml"/>
- </fileset>
- </copy>
-
<!-- Build standard config manually -->
<copy todir="${install.standard}">
<fileset dir="${install.default}">
@@ -1810,25 +1736,6 @@
</target>
<!-- =========== -->
- <!-- JBoss OSGi -->
- <!-- =========== -->
-
- <target name="module-osgi">
- <property name="osgi.module.name" value="osgi"/>
- <property name="osgi.module.output" value="${project.root}/${osgi.module.name}/zip/target"/>
-
- <!-- [JBAS-7909] AOPClassLoaderDeployer breaks OSGi integration -->
- <echo message="${project.root}/${osgi.module.name}/jar/target"/>
- <copy todir="${install.lib}">
- <fileset dir="${project.root}/${osgi.module.name}/jar/target">
- <include name="jboss-osgi-asintegration.jar"/>
- </fileset>
- </copy>
-
- <unzip dest="${install.osgi}" src="${osgi.module.output}/jboss-as-osgi-distribution-${project.version}.zip"/>
- </target>
-
- <!-- =========== -->
<!-- Resteasy -->
<!-- =========== -->
@@ -2317,7 +2224,6 @@
<fileset refid="xerces:xercesImpl:jar"/>
<fileset refid="xml-resolver:xml-resolver:jar"/>
<fileset refid="org.jboss:jbossxb:jar"/>
- <fileset refid="org.jboss.osgi.framework:jboss-osgi-framework-metadata:jar"/>
<fileset refid="org.jboss.security:jboss-security-spi:jar"/>
<fileset refid="org.jboss.security:jbosssx:jar"/>
<mapper refid="remove-versions" />
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-09-23 19:41:04 UTC (rev 108304)
+++ trunk/component-matrix/pom.xml 2010-09-24 01:24:21 UTC (rev 108305)
@@ -31,8 +31,6 @@
<!-- Properties -->
<properties>
- <version.apache.aries.jmx>0.1-incubating</version.apache.aries.jmx>
- <version.apache.aries.util>0.1-incubating</version.apache.aries.util>
<version.apache.cxf>2.2.10</version.apache.cxf>
<version.apache.neethi>2.0.4</version.apache.neethi>
<version.apache.felix.log>1.0.0</version.apache.felix.log>
@@ -60,25 +58,6 @@
<version.jboss.jbossws-spi>1.4.0.Beta3</version.jboss.jbossws-spi>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
<version.jboss.jsf-deployer>1.0.2</version.jboss.jsf-deployer>
- <version.jboss.osgi.blueprint>1.0.0.Beta2</version.jboss.osgi.blueprint>
- <version.jboss.osgi.common>1.0.4</version.jboss.osgi.common>
- <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
- <version.jboss.osgi.deployers>1.0.7</version.jboss.osgi.deployers>
- <version.jboss.osgi.deployment>1.0.2</version.jboss.osgi.deployment>
- <version.jboss.osgi.framework>1.0.0.Alpha5</version.jboss.osgi.framework>
- <version.jboss.osgi.husky>1.0.4</version.jboss.osgi.husky>
- <version.jboss.osgi.jaxb>2.1.10.SP5</version.jboss.osgi.jaxb>
- <version.jboss.osgi.jbossas>1.0.3</version.jboss.osgi.jbossas>
- <version.jboss.osgi.jmx>1.0.7</version.jboss.osgi.jmx>
- <version.jboss.osgi.jndi>1.0.3</version.jboss.osgi.jndi>
- <version.jboss.osgi.jta>1.0.1</version.jboss.osgi.jta>
- <version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect>
- <version.jboss.osgi.spi>1.0.9</version.jboss.osgi.spi>
- <version.jboss.osgi.vfs>1.0.0</version.jboss.osgi.vfs>
- <version.jboss.osgi.webapp>1.0.0</version.jboss.osgi.webapp>
- <version.jboss.osgi.webconsole>1.0.3</version.jboss.osgi.webconsole>
- <version.jboss.osgi.xerces>2.9.1.SP5</version.jboss.osgi.xerces>
- <version.jboss.osgi.xml.binding>2.0.2.Beta4.SP2</version.jboss.osgi.xml.binding>
<version.jboss.web>3.0.0-beta-7</version.jboss.web>
<version.jgroups>2.10.0.Beta2</version.jgroups>
<version.jsr181.api>1.0-MR1</version.jsr181.api>
@@ -159,7 +138,6 @@
<version.org.jboss.weld>1.1.0.Beta1</version.org.jboss.weld>
<version.org.jboss.xnio>2.1.0.CR2</version.org.jboss.xnio>
<version.org.jboss.xnio.metadata>2.1.0.CR5</version.org.jboss.xnio.metadata>
- <version.org.osgi>4.2.0</version.org.osgi>
<version.org.slf4j>1.5.6</version.org.slf4j>
<version.ch.qos.cal10n>0.7.2</version.ch.qos.cal10n>
<version.org.springframework>3.0.1.RELEASE</version.org.springframework>
@@ -3640,60 +3618,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-core</artifactId>
- <version>${version.jboss.osgi.framework}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-metadata</artifactId>
- <version>${version.jboss.osgi.framework}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-resolver</artifactId>
- <version>${version.jboss.osgi.framework}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs</artifactId>
- <version>${version.jboss.osgi.vfs}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs30</artifactId>
- <version>${version.jboss.osgi.vfs}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${version.org.osgi}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.org.osgi}</version>
- </dependency>
-
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
<version>${version.org.springframework}</version>
Modified: trunk/depchain/pom.xml
===================================================================
--- trunk/depchain/pom.xml 2010-09-23 19:41:04 UTC (rev 108304)
+++ trunk/depchain/pom.xml 2010-09-24 01:24:21 UTC (rev 108305)
@@ -179,12 +179,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas.osgi</groupId>
- <artifactId>jboss-as-osgi-distribution</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- </dependency>
- <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-profileservice</artifactId>
<version>${project.version}</version>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-09-23 19:41:04 UTC (rev 108304)
+++ trunk/pom.xml 2010-09-24 01:24:21 UTC (rev 108305)
@@ -540,7 +540,6 @@
<module>jbossas-remoting</module>
<module>main</module>
<module>management</module>
- <module>osgi</module>
<module>profileservice</module>
<module>resteasy-int</module>
<module>security</module>
Modified: trunk/server/src/etc/conf/all/bootstrap/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/deployers.xml 2010-09-23 19:41:04 UTC (rev 108304)
+++ trunk/server/src/etc/conf/all/bootstrap/deployers.xml 2010-09-24 01:24:21 UTC (rev 108305)
@@ -178,8 +178,7 @@
<bean name="AOPAnnotationMetaDataParserDeployer" class="org.jboss.aop.asintegration.jboss5.AOPAnnotationMetaDataParserDeployer">
<constructor><parameter>0</parameter></constructor>
</bean>
- <!-- bean name="AOPClassLoaderDeployer" class="org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer" -->
- <bean name="AOPClassLoaderDeployer" class="org.jboss.osgi.integration.jbossas.AOPClassLoaderDeployerJBAS7909">
+ <bean name="AOPClassLoaderDeployer" class="org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer">
<property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
</bean>
<bean name="AOPDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.AOPDeploymentAopMetaDataDeployer">
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-09-23 19:41:04 UTC (rev 108304)
+++ trunk/testsuite/build.xml 2010-09-24 01:24:21 UTC (rev 108305)
@@ -470,12 +470,8 @@
<pathelement path="${project.tools}/ant/lib/ant-junit.jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-ejb3:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-ejb3:jar:client"/>
- <fileset refid="org.jboss.osgi:jboss-osgi-spi:jar"/>
- <fileset refid="org.jboss.osgi.vfs:jboss-osgi-vfs:jar"/>
<fileset refid="org.jboss.shrinkwrap:shrinkwrap-api:jar"/>
<fileset refid="org.jboss.test:jboss-test:jar"/>
- <fileset refid="org.osgi:org.osgi.compendium:jar"/>
- <fileset refid="org.osgi:org.osgi.core:jar"/>
<path refid="org.jboss.jbossas.tomcat.classpath"/>
<path refid="thirdparty.classpath"/>
</path>
@@ -491,19 +487,12 @@
<pathelement path="${local.classpath}"/>
<pathelement path="${project.tools}/ant/lib/ant.jar"/>
<pathelement path="${project.tools}/ant/lib/ant-junit.jar"/>
- <fileset refid="org.apache.aries.jmx:org.apache.aries.jmx.api:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-ejb3:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-ejb3:jar:client"/>
- <fileset refid="org.jboss.osgi:jboss-osgi-spi:jar"/>
- <fileset refid="org.jboss.osgi.jmx:jboss-osgi-jmx-api:jar"/>
- <fileset refid="org.jboss.osgi.vfs:jboss-osgi-vfs:jar"/>
- <fileset refid="org.jboss.osgi.vfs:jboss-osgi-vfs30:jar"/>
<fileset refid="org.jboss.shrinkwrap:shrinkwrap-api:jar"/>
<fileset refid="org.jboss.shrinkwrap:shrinkwrap-spi:jar"/>
<fileset refid="org.jboss.shrinkwrap:shrinkwrap-impl-base:jar"/>
<fileset refid="org.jboss.test:jboss-test:jar"/>
- <fileset refid="org.osgi:org.osgi.compendium:jar"/>
- <fileset refid="org.osgi:org.osgi.core:jar"/>
<path refid="thirdparty.classpath"/>
</path>
@@ -938,15 +927,6 @@
<patternset id="iiop.excludes">
<exclude name="org/jboss/test/*iiop/test/*"/>
</patternset>
- <!-- Tests needing OSGi setup -->
- <patternset id="osgi.includes">
- <include name="org/jboss/test/osgi/*TestCase.class"/>
- <include name="org/jboss/test/osgi/*/*TestCase.class"/>
- </patternset>
- <patternset id="osgi.excludes">
- <exclude name="org/jboss/test/osgi/*TestCase.class"/>
- <exclude name="org/jboss/test/osgi/*/*TestCase.class"/>
- </patternset>
<!-- A patternset that requires jboss to run with a JACC security manager -->
<patternset id="jacc.includes">
<include name="**/test/jacc/test/*TestCase.class"/>
@@ -1257,7 +1237,6 @@
<antcall target="tests-jacc-securitymgr" inheritRefs="true"/>
<antcall target="tests-mod_cluster" inheritRefs="true"/>
<antcall target="tests-ha-mod_cluster" inheritRefs="true"/>
- <antcall target="tests-osgi" inheritRefs="true"/>
<!-- JBAS-7247 classloader leak tests have been moved out of this
target; see target tests-all-classloader-leak -->
<antcall target="tests-report" inheritRefs="true"/>
@@ -2597,113 +2576,6 @@
</junit>
</target>
- <!-- Test the OSGi setup -->
- <target name="tests-osgi" depends="init"
- description="A basic set of OSGi units tests which are run against the jboss osgi config">
- <server:start name="osgi"/>
- <antcall target="tests-osgi-raw" inheritRefs="true"/>
- <server:stop name="osgi"/>
- </target>
-
- <target name="tests-osgi-raw" depends="init">
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
- <junit dir="${module.output}"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${junit.timeout}"
- jvm="${junit.jvm}">
-
- <jvmarg line="${junit.jvm.options}"/>
- <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
- <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
- <sysproperty key="jbosstest.server.host" value="${node0}"/>
-
- <classpath>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.resources}"/>
- <path refid="tests.classpath"/>
- </classpath>
-
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
- <formatter type="plain" usefile="${junit.formatter.usefile}"/>
-
- <batchtest todir="${build.reports}"
- haltonerror="${junit.batchtest.haltonerror}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- fork="${junit.batchtest.fork}">
- <fileset dir="${build.classes}">
- <patternset refid="osgi.includes"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <!--
- | IIOP test cases that should run successfully
- -->
- <target name="tests-iiop" depends="init">
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
- <junit dir="${module.output}"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${junit.timeout}"
- jvm="${junit.jvm}">
-
- <jvmarg value="-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton"/>
- <jvmarg value="-Djacorb.orb.print_version=off"/>
- <jvmarg value="-Djacorb.log.default.verbosity=0"/>
- <jvmarg value="-Djacorb.interop.strict_check_on_tc_creation=off"/>
- <jvmarg value="-Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory"/>
- <jvmarg value="-Djacorb.security.ssl.client.supported_options=0"/>
- <jvmarg value="-Djacorb.security.ssl.client.required_options=0"/>
- <jvmarg value="-DORBInitRef.NameService=corbaloc::${node0}:3528/JBoss/Naming/root"/>
- <jvmarg value="-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer"/>
- <jvmarg value="-Djava.security.manager"/>
- <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
- <sysproperty key="jbosstest.server.host" value="${node0}"/>
- <sysproperty key="java.security.policy" value="${build.resources}/iiop/client.policy"/>
- <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
- <!-- Pass along any jbosstest.* system properties -->
- <syspropertyset>
- <propertyref prefix="jbosstest."/>
- </syspropertyset>
-
- <classpath>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.resources}"/>
- <path refid="tests.classpath"/>
- <fileset refid="org.jboss.jbossas:jboss-as-iiop:jar"/>
- </classpath>
-
- <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
- <sysproperty key="jboss-junit-configuration" value="tests-iiop"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}"
- extension="-tests-iiop.xml"/>
-
- <batchtest todir="${build.reports}"
- haltonerror="${junit.batchtest.haltonerror}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- fork="${junit.batchtest.fork}">
-
- <fileset dir="${build.classes}">
- <patternset refid="iiop.includes"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
<!-- Test the XML binding framework -->
<target name="tests-xml-unit">
<mkdir dir="${build.reports}"/>
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2010-09-23 19:41:04 UTC (rev 108304)
+++ trunk/testsuite/imports/server-config.xml 2010-09-24 01:24:21 UTC (rev 108305)
@@ -267,14 +267,6 @@
<sysproperty key="java.net.preferIPv4Stack" value="true" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
</server>
- <server name="osgi" host="${node0}">
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx256m" />
- <jvmarg value="-XX:MaxPermSize=512m" />
- <jvmarg value="-XX:-UseGCOverheadLimit" />
- <sysproperty key="java.net.preferIPv4Stack" value="true" />
- <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
- </server>
<server name="tomcat-webctx" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<jvmarg value="-Xms128m" />
Modified: trunk/testsuite/pom.xml
===================================================================
--- trunk/testsuite/pom.xml 2010-09-23 19:41:04 UTC (rev 108304)
+++ trunk/testsuite/pom.xml 2010-09-24 01:24:21 UTC (rev 108305)
@@ -133,10 +133,6 @@
<artifactId>juddi-saaj</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
More information about the jboss-cvs-commits
mailing list