[jboss-cvs] JBossAS SVN: r90675 - in branches/dml-log-service-integration: build and 20 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 29 10:27:53 EDT 2009
Author: david.lloyd at jboss.com
Date: 2009-06-29 10:27:52 -0400 (Mon, 29 Jun 2009)
New Revision: 90675
Added:
branches/dml-log-service-integration/jbossas-jmx-remoting/src/etc/jboss-scanning.xml
branches/dml-log-service-integration/server/src/resources/uuid-key-generator/META-INF/jboss-scanning.xml
branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/Ejb3MetricsUnitTestCase.java
branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/
branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLocalBusiness.java
branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLoggingMDB.java
branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatefulBean.java
branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatelessBean.java
branches/dml-log-service-integration/testsuite/src/resources/profileservice/testEjb3Metrics-application.xml
branches/dml-log-service-integration/testsuite/src/resources/profileservice/testEjb3MetricsQueue-service.xml
branches/dml-log-service-integration/testsuite/src/resources/security-provider.properties
branches/dml-log-service-integration/varia/src/assembly/httpha-invoker-sar.xml
branches/dml-log-service-integration/varia/src/assembly/snmp-adaptor-sar.xml
branches/dml-log-service-integration/varia/src/resources/jmx/web-inf/jboss-scanning.xml
Removed:
branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLocalBusiness.java
branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLoggingMDB.java
branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatefulBean.java
branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatelessBean.java
branches/dml-log-service-integration/tools/etc/buildmagic/libraries.ent
branches/dml-log-service-integration/varia/build-sars.xml
branches/dml-log-service-integration/varia/build.xml
branches/dml-log-service-integration/varia/src/assembly/httpa-invoker-sar.xml
Modified:
branches/dml-log-service-integration/build/build.xml
branches/dml-log-service-integration/component-matrix/pom.xml
branches/dml-log-service-integration/jbossas-jmx-remoting/pom.xml
branches/dml-log-service-integration/pom.xml
branches/dml-log-service-integration/testsuite/build.xml
branches/dml-log-service-integration/testsuite/imports/config/tests-clustering.xml
branches/dml-log-service-integration/testsuite/imports/sections/profileservice.xml
branches/dml-log-service-integration/testsuite/imports/server-config.xml
branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java
branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java
branches/dml-log-service-integration/thirdparty/pom.xml
branches/dml-log-service-integration/tools/etc/buildmagic/aliases.ent
branches/dml-log-service-integration/tools/maven/ant-tasks/maven-ant-tasks-2.1.0-SNAPSHOT.jar
branches/dml-log-service-integration/varia/pom.xml
branches/dml-log-service-integration/varia/src/assembly/deployment-service-sar.xml
branches/dml-log-service-integration/varia/src/assembly/http-invoker-sar.xml
Log:
Merge from trunk: -r90554:90672
Modified: branches/dml-log-service-integration/build/build.xml
===================================================================
--- branches/dml-log-service-integration/build/build.xml 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/build/build.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -254,9 +254,6 @@
<copy tofile="${install.default}/deployers/clustering-deployer-jboss-beans.xml"
file="${project.root}/cluster/target/etc/clustering-deployer-jboss-beans-non-clustered.xml"/>
- <unjar src="${project.root}/varia/target/http-invoker.sar"
- dest="${install.default}/deploy/http-invoker.sar"/>
-
<!-- Build server/minimal manually -->
<mkdir dir="${install.minimal.deploy}"/>
<mkdir dir="${install.minimal.deployers}"/>
@@ -1358,13 +1355,12 @@
</copy>
<mkdir dir="${install.examples}/jmx/persistent-service.sar"/>
- <unjar src="${varia.module.output}/persistent-service.sar" dest="${install.examples}/jmx/persistent-service.sar"/>
+ <unjar src="${varia.module.output}/jboss-as-varia-persistent-service-sar.jar" dest="${install.examples}/jmx/persistent-service.sar"/>
<mkdir dir="${install.examples.varia}/deployment-service"/>
+ <copy file="${varia.module.output}/jboss-as-varia-deployment-service-sar.jar"
+ tofile="${install.examples.varia}/deployment-service/deployment-service.sar"/>
<copy todir="${install.examples.varia}/deployment-service">
- <fileset dir="${varia.module.output}/">
- <include name="deployment-service.sar"/>
- </fileset>
<fileset dir="${varia.module.output}/resources/services/deployment">
<exclude name="META-INF/**"/>
</fileset>
@@ -1372,7 +1368,7 @@
<!-- MBean Configurator sar for setting mbean attributes when registered -->
<mkdir dir="${install.examples}/jmx/mbean-configurator.sar"/>
- <unjar src="${varia.module.output}/mbean-configurator.sar" dest="${install.examples}/jmx/mbean-configurator.sar"/>
+ <unjar src="${varia.module.output}/jboss-as-varia-mbean-configurator-sar.jar" dest="${install.examples}/jmx/mbean-configurator.sar"/>
<!-- Client jars -->
<mkdir dir="${install.client}"/>
@@ -1402,7 +1398,7 @@
<!-- copy snmp-adaptor.sar unpacked to deploy -->
<mkdir dir="${install.server}/all/deploy/snmp-adaptor.sar"/>
- <unjar src="${varia.module.output}/snmp-adaptor.sar"
+ <unjar src="${varia.module.output}/jboss-as-varia-snmp-adaptor-sar.jar"
dest="${install.server}/all/deploy/snmp-adaptor.sar">
<mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
</unjar>
@@ -1414,7 +1410,7 @@
<!-- Include the HTTP invoker service unpacked -->
<mkdir dir="${install.server}/all/deploy/httpha-invoker.sar"/>
- <unjar src="${varia.module.output}/httpha-invoker.sar" dest="${install.server}/all/deploy/httpha-invoker.sar"/>
+ <unjar src="${varia.module.output}/jboss-as-varia-httpha-invoker-sar.jar" dest="${install.server}/all/deploy/httpha-invoker.sar"/>
<!-- copy the ant jmx client -->
<mkdir dir="${install.client}"/>
@@ -1488,6 +1484,9 @@
</fileset>
</copy>
+ <unjar src="${project.root}/varia/target/jboss-as-varia-http-invoker-sar.jar"
+ dest="${install.default}/deploy/http-invoker.sar"/>
+
</target>
<target name="module-varia-all" depends="module-varia">
Modified: branches/dml-log-service-integration/component-matrix/pom.xml
===================================================================
--- branches/dml-log-service-integration/component-matrix/pom.xml 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/component-matrix/pom.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -50,7 +50,7 @@
<version.org.hibernate.entity.manager>3.4.0.GA</version.org.hibernate.entity.manager>
<version.org.hibernate.validator>3.1.0.GA</version.org.hibernate.validator>
<version.org.hibernate>3.3.1.GA</version.org.hibernate>
- <version.org.jboss.aop>2.1.1.GA</version.org.jboss.aop>
+ <version.org.jboss.aop>2.1.3.GA</version.org.jboss.aop>
<version.org.jboss.aspects.currentinvocation>1.0.0.GA</version.org.jboss.aspects.currentinvocation>
<version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
<version.org.jboss.aspects.security>1.0.0.GA</version.org.jboss.aspects.security>
@@ -86,7 +86,7 @@
<version.org.jboss.man>2.1.1.CR1</version.org.jboss.man>
<version.org.jboss.mdr>2.0.2.GA</version.org.jboss.mdr>
<version.org.jboss.metadata>1.0.1.GA</version.org.jboss.metadata>
- <version.org.jboss.microcontainer>2.0.7.GA</version.org.jboss.microcontainer>
+ <version.org.jboss.microcontainer>2.0.8.GA</version.org.jboss.microcontainer>
<version.org.jboss.mx>6.0.0.Beta1</version.org.jboss.mx>
<version.org.jboss.naming>5.0.3.GA</version.org.jboss.naming>
<version.org.jboss.reflect>2.0.2.GA</version.org.jboss.reflect>
@@ -523,7 +523,7 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-security-aspects</artifactId>
@@ -1708,9 +1708,9 @@
</dependency>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-endpoint-deployer</artifactId>
- <version>${version.org.jboss.ejb3.endpoint.deployer}</version>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-endpoint-deployer</artifactId>
+ <version>${version.org.jboss.ejb3.endpoint.deployer}</version>
</dependency>
<dependency>
Modified: branches/dml-log-service-integration/jbossas-jmx-remoting/pom.xml
===================================================================
--- branches/dml-log-service-integration/jbossas-jmx-remoting/pom.xml 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/jbossas-jmx-remoting/pom.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -50,6 +50,7 @@
<zipfileset dir="target/etc"
prefix="META-INF">
<include name="jboss-service.xml"/>
+ <include name="jboss-scanning.xml"/>
</zipfileset>
</zip>
Copied: branches/dml-log-service-integration/jbossas-jmx-remoting/src/etc/jboss-scanning.xml (from rev 90672, trunk/jbossas-jmx-remoting/src/etc/jboss-scanning.xml)
===================================================================
--- branches/dml-log-service-integration/jbossas-jmx-remoting/src/etc/jboss-scanning.xml (rev 0)
+++ branches/dml-log-service-integration/jbossas-jmx-remoting/src/etc/jboss-scanning.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -0,0 +1,3 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+<!-- Purpose: Disable scanning for annotations in contained deployment. -->
+</scanning>
Modified: branches/dml-log-service-integration/pom.xml
===================================================================
--- branches/dml-log-service-integration/pom.xml 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/pom.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -36,6 +36,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
@@ -72,6 +77,7 @@
<Os-Arch>${os.arch}</Os-Arch>
<Os-Version>${os.version}</Os-Version>
<Scm-Revision>${buildNumber}</Scm-Revision>
+ <Scm-Url>${project.scm.developerConnection}</Scm-Url>
<Build-Time>${timestamp}</Build-Time>
</manifestEntries>
</manifestSection>
@@ -107,6 +113,7 @@
<Os-Arch>${os.arch}</Os-Arch>
<Os-Version>${os.version}</Os-Version>
<Scm-Revision>${buildNumber}</Scm-Revision>
+ <Scm-Url>${project.scm.developerConnection}</Scm-Url>
<Build-Time>${timestamp}</Build-Time>
</manifestEntries>
</manifestSection>
@@ -146,7 +153,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jboss-packaging-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
+ <version>2.0</version>
<extensions>true</extensions>
</plugin>
<plugin>
@@ -427,6 +434,7 @@
</profile>
<profile>
+ <!-- This profile can be used to build a single module and update the dist -->
<id>single-module</id>
<activation>
<property>
@@ -435,6 +443,7 @@
</activation>
<modules>
<module>${module}</module>
+ <module>build</module>
</modules>
</profile>
Copied: branches/dml-log-service-integration/server/src/resources/uuid-key-generator/META-INF/jboss-scanning.xml (from rev 90672, trunk/server/src/resources/uuid-key-generator/META-INF/jboss-scanning.xml)
===================================================================
--- branches/dml-log-service-integration/server/src/resources/uuid-key-generator/META-INF/jboss-scanning.xml (rev 0)
+++ branches/dml-log-service-integration/server/src/resources/uuid-key-generator/META-INF/jboss-scanning.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -0,0 +1,3 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+<!-- Purpose: Disable scanning for annotations in contained deployment. -->
+</scanning>
Modified: branches/dml-log-service-integration/testsuite/build.xml
===================================================================
--- branches/dml-log-service-integration/testsuite/build.xml 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/testsuite/build.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project [
<!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
- <!ENTITY testsuite-libraries SYSTEM "../thirdparty/testsuite-libraries.ent">
<!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
]>
@@ -111,12 +110,20 @@
<!-- ========= -->
&libraries;
- &testsuite-libraries;
- <!-- The combined library classpath -->
- <path id="library.classpath">
+ <!-- ======= -->
+ <!-- Modules -->
+
+ &modules;
+
+ <target name="init-paths" depends="init-dependencies" unless="init-paths.target.complete"
+ description="initialize the classpath refs">
+
+ <!-- The combined library classpath -->
+ <path id="library.classpath">
<path refid="apache.avalon.classpath"/>
<path refid="apache.commons.classpath"/>
+ <fileset refid="apache-httpclient:commons-httpclient:jar"/>
<path refid="apache.codec.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="apache.jaxme.classpath"/>
@@ -124,7 +131,7 @@
<path refid="apache.xerces.classpath"/>
<path refid="org.apache.classpath"/>
<path refid="dom4j.dom4j.classpath"/>
- <path refid="httpunit.httpunit.classpath"/>
+ <fileset refid="httpunit:httpunit:jar"/>
<path refid="ibm.wsdl4j.classpath"/>
<path refid="jacorb.jacorb.classpath"/>
<path refid="jboss.cache.jbosscache.core.classpath"/>
@@ -175,8 +182,8 @@
<path refid="hibernate3.classpath"/>
<path refid="odmg.classpath"/>
<path refid="cglib.classpath"/>
- <!-- Need spring jar for spring-based tests -->
- <path refid="spring.classpath"/>
+ <!-- Need spring jar for spring-based tests -->
+ <path refid="spring.classpath"/>
<!-- xml binding -->
<path refid="xmlunit.xmlunit.classpath"/>
@@ -192,29 +199,26 @@
<!-- org.jboss.aspects:jboss-aspects -->
<path refid="org.jboss.aspects.classpath"/>
+ <!-- JBAS-6934 -->
+ <path refid="net.jcip.classpath"/>
- </path>
+ </path>
- <!-- ======= -->
- <!-- Modules -->
-
- &modules;
-
- <!-- ======= -->
- <!-- InternalServer -->
- <!-- This could be a mistake. Perhaps, though, it would be a good idea to separate
- tests that need internal jboss classes from those that don't. When I put it in, only
- the jca XATxConnectionManagerUnitTestCase needed an internal class (the tx manager)-->
- <property name="jboss.internal-server.root" value="${project.root}/server/output"/>
- <property name="jboss.internal-server.lib" value="${jboss.internal-server.root}/lib"/>
- <path id="jboss.internal-server.classpath">
+ <!-- ======= -->
+ <!-- InternalServer -->
+ <!-- This could be a mistake. Perhaps, though, it would be a good idea to separate
+ tests that need internal jboss classes from those that don't. When I put it in, only
+ the jca XATxConnectionManagerUnitTestCase needed an internal class (the tx manager)-->
+ <property name="jboss.internal-server.root" value="${project.root}/server/output"/>
+ <property name="jboss.internal-server.lib" value="${jboss.internal-server.root}/lib"/>
+ <path id="jboss.internal-server.classpath">
<pathelement path="${jboss.server.lib}/jboss.jar"/>
<pathelement path="${jboss.server.lib}/jboss-main.jar"/>
<pathelement path="${jboss.server.lib}/jboss-system.jar"/>
- </path>
+ </path>
- <!-- The combined dependant module classpath -->
- <path id="dependentmodule.classpath">
+ <!-- The combined dependant module classpath -->
+ <path id="dependentmodule.classpath">
<path refid="jboss.aop.classpath"/>
<path refid="jboss.aspects.classpath"/>
<path refid="jboss.cluster.classpath"/>
@@ -254,8 +258,61 @@
<path refid="jboss.varia.classpath"/>
<path refid="jboss.web.classpath"/>
<path refid="jboss.spring.classpath"/>
- </path>
+ </path>
+ <!-- The combined thirdparty classpath -->
+ <path id="thirdparty.classpath">
+ <path refid="library.classpath"/>
+ <path refid="dependentmodule.classpath"/>
+ </path>
+
+ <path id="javac.classpath">
+ <path refid="thirdparty.classpath"/>
+ </path>
+
+ <!-- classpath and local.classpath must have a value using with a path -->
+ <property name="classpath" value=""/>
+ <property name="local.classpath" value=""/>
+
+ <!-- Classpath to build and run the tests -->
+ <path id="tests.compile.classpath">
+ <pathelement path="${classpath}"/>
+ <pathelement path="${local.classpath}"/>
+ <pathelement path="${project.tools}/lib/ant.jar"/>
+ <pathelement path="${project.tools}/lib/ant-junit.jar"/>
+ <path refid="jboss.ejb3.classpath"/>
+ <path refid="jboss.jmx-remoting.classpath"/>
+ <path refid="jboss.test.classpath"/>
+ <path refid="jboss.tomcat.classpath"/>
+ <path refid="thirdparty.classpath"/>
+ </path>
+
+ <!-- Classpath to build and run the tests -->
+ <path id="tests.classpath">
+ <fileset dir="${jboss.dist}/client">
+ <include name="**/*.jar"/>
+ <exclude name="jaxws-rt.jar"/>
+ <exclude name="jaxws-tools.jar"/>
+ </fileset>
+
+ <pathelement path="${classpath}"/>
+ <pathelement path="${local.classpath}"/>
+ <pathelement path="${project.tools}/lib/ant.jar"/>
+ <pathelement path="${project.tools}/lib/ant-junit.jar"/>
+ <path refid="jboss.ejb3.classpath"/>
+ <path refid="jboss.jmx-remoting.classpath"/>
+ <path refid="jboss.test.classpath"/>
+ <path refid="thirdparty.classpath"/>
+ </path>
+
+ <!-- The classpath required to build javadocs. -->
+ <path id="javadoc.classpath">
+ <path refid="tests.compile.classpath"/>
+ </path>
+
+ <property name="init-paths.target.complete" value="true"/>
+ </target>
+
<!-- RMI Stub generation -->
<patternset id="rmic.includes"
description="The patternset passed to the compile-stubs target">
@@ -296,59 +353,9 @@
<property name="release.id" value="${install.id}"/>
<property name="install.root" value="${module.output}/${install.id}"/>
- <!-- The combined thirdparty classpath -->
- <path id="thirdparty.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- </path>
-
- <path id="javac.classpath">
- <path refid="thirdparty.classpath"/>
- </path>
-
- <!-- classpath and local.classpath must have a value using with a path -->
- <property name="classpath" value=""/>
- <property name="local.classpath" value=""/>
-
- <!-- Classpath to build and run the tests -->
- <path id="tests.compile.classpath">
- <pathelement path="${classpath}"/>
- <pathelement path="${local.classpath}"/>
- <pathelement path="${project.tools}/lib/ant.jar"/>
- <pathelement path="${project.tools}/lib/ant-junit.jar"/>
- <path refid="jboss.ejb3.classpath"/>
- <path refid="jboss.jmx-remoting.classpath"/>
- <path refid="jboss.test.classpath"/>
- <path refid="jboss.tomcat.classpath"/>
- <path refid="thirdparty.classpath"/>
- </path>
-
<!-- Import the jboss server run targets -->
<import file="imports/server-config.xml"/>
- <!-- Classpath to build and run the tests -->
- <path id="tests.classpath">
- <fileset dir="${jboss.dist}/client">
- <include name="**/*.jar"/>
- <exclude name="jaxws-rt.jar"/>
- <exclude name="jaxws-tools.jar"/>
- </fileset>
-
- <pathelement path="${classpath}"/>
- <pathelement path="${local.classpath}"/>
- <pathelement path="${project.tools}/lib/ant.jar"/>
- <pathelement path="${project.tools}/lib/ant-junit.jar"/>
- <path refid="jboss.ejb3.classpath"/>
- <path refid="jboss.jmx-remoting.classpath"/>
- <path refid="jboss.test.classpath"/>
- <path refid="thirdparty.classpath"/>
- </path>
-
- <!-- The classpath required to build javadocs. -->
- <path id="javadoc.classpath">
- <path refid="tests.compile.classpath"/>
- </path>
-
<!-- Packages to include when generating api documentation -->
<property name="javadoc.packages" value="org.jboss.*"/>
@@ -369,15 +376,16 @@
<propertyref prefix="jbosstest."/>
</propertyset>
- <target name="init-maven-ant-tasks">
+ <target name="init-maven-ant-tasks" unless="init-maven-ant-tasks.target.complete">
<path id="maven-ant-tasks.classpath" path="../tools/maven/ant-tasks/maven-ant-tasks-2.1.0-SNAPSHOT.jar" />
<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="antlib:org.apache.maven.artifact.ant"
classpathref="maven-ant-tasks.classpath" />
+ <property name="init-maven-ant-tasks.target.complete" value="true"/>
</target>
- <target name="init-dependencies" depends="init-maven-ant-tasks">
+ <target name="init-dependencies" depends="init-maven-ant-tasks" unless="init-dependencies.target.complete">
<!-- ================================================================== -->
<!-- Init the maven ant tasks -->
<!-- ================================================================== -->
@@ -406,9 +414,10 @@
version="${component-matrix.project.properties.version.jboss.jaxr}" type="sar"/>
</maven:dependencies>
+ <property name="init-dependencies.target.complete" value="true"/>
</target>
- <target name="init" depends="init-dependencies">
+ <target name="init" depends="init-paths" unless="init.target.complete">
<record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/>
<mkdir dir="${build.gen-src}/org/jboss/test/cts/ejb"/>
<mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/>
@@ -427,6 +436,8 @@
<mkdir dir="${build.gen-src}/org/jboss/test/classloader/scoping/singleton"/>
<copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java"
file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt" overwrite="false"/>
+
+ <property name="init.target.complete" value="true"/>
</target>
<!-- retrieve items from the repository, store them in the -->
@@ -1012,42 +1023,42 @@
depends="maybejars">
<record name="${basedir}/output/tests.log" append="no" action="start" loglevel="info"/>
<property name="nojars" value="true"/>
- <antcall target="jboss-minimal-tests" />
- <antcall target="jboss-all-config-tests"/>
- <antcall target="tests-profileservice"/>
- <antcall target="tests-bootstrap-dependencies"/>
- <antcall target="tests-springdeployer"/>
+ <antcall target="jboss-minimal-tests" inheritRefs="true"/>
+ <antcall target="jboss-all-config-tests" inheritRefs="true"/>
+ <antcall target="tests-profileservice" inheritRefs="true"/>
+ <antcall target="tests-bootstrap-dependencies" inheritRefs="true"/>
+ <antcall target="tests-springdeployer" inheritRefs="true"/>
- <antcall target="tests-security-manager"/>
+ <antcall target="tests-security-manager" inheritRefs="true"/>
- <antcall target="tests-clustering-all-stacks"/>
- <antcall target="tomcat-ssl-tests"/>
- <antcall target="tomcat-sso-tests"/>
- <antcall target="tomcat-sso-clustered-tests"/>
- <antcall target="tomcat-webctx-tests"/>
- <antcall target="tomcat-federation-tests"/>
- <antcall target="tests-binding-manager"/>
- <antcall target="tests-jacc-security"/>
- <antcall target="tests-jacc-securitymgr"/>
- <antcall target="tests-jacc-security-allstarrole"/>
+ <antcall target="tests-clustering-all-stacks" inheritRefs="true"/>
+ <antcall target="tomcat-ssl-tests" inheritRefs="true"/>
+ <antcall target="tomcat-sso-tests" inheritRefs="true"/>
+ <antcall target="tomcat-sso-clustered-tests" inheritRefs="true"/>
+ <antcall target="tomcat-webctx-tests" inheritRefs="true"/>
+ <antcall target="tomcat-federation-tests" inheritRefs="true"/>
+ <antcall target="tests-binding-manager" inheritRefs="true"/>
+ <antcall target="tests-jacc-security" inheritRefs="true"/>
+ <antcall target="tests-jacc-securitymgr" inheritRefs="true"/>
+ <antcall target="tests-jacc-security-allstarrole" inheritRefs="true"/>
<!--
<antcall target="tests-security-jaspi-unit"/>
-->
- <antcall target="tests-jbossmessaging"/>
- <antcall target="tests-jbossmessaging-cluster"/>
- <antcall target="tests-compatibility"/>
- <antcall target="tests-aop-scoped"/>
- <antcall target="jrmp-invoker-tests"/>
- <antcall target="pooled-invoker-tests"/>
- <antcall target="tests-clustered-profileservice"/>
- <antcall target="tests-web-profile"/>
+ <antcall target="tests-jbossmessaging" inheritRefs="true"/>
+ <antcall target="tests-jbossmessaging-cluster" inheritRefs="true"/>
+ <antcall target="tests-compatibility" inheritRefs="true"/>
+ <antcall target="tests-aop-scoped" inheritRefs="true"/>
+ <antcall target="jrmp-invoker-tests" inheritRefs="true"/>
+ <antcall target="pooled-invoker-tests" inheritRefs="true"/>
+ <antcall target="tests-clustered-profileservice" inheritRefs="true"/>
+ <antcall target="tests-web-profile" inheritRefs="true"/>
<!-- NOTE: Run the classloader leak tests last as they can be
disruptive to the overall run if there are failures. -->
- <antcall target="tests-classloader-leak"/>
- <antcall target="tests-clustered-classloader-leak"/>
+ <antcall target="tests-classloader-leak" inheritRefs="true"/>
+ <antcall target="tests-clustered-classloader-leak" inheritRefs="true"/>
- <antcall target="tests-report"/>
+ <antcall target="tests-report" inheritRefs="true"/>
<!-- JBAS-5918 https://issues.apache.org/bugzilla/show_bug.cgi?id=41368
<record name="${basedir}/output/tests.log" action="stop"/>
-->
@@ -1085,28 +1096,28 @@
<target name="jboss-all-config-tests"
description="The units tests which are run against the jboss all config" depends="init">
<server:start name="all"/>
- <antcall target="tests-standard-unit"/>
- <antcall target="tests-client-unit"/>
- <antcall target="tests-security-basic-unit"/>
- <antcall target="tests-standard-stress"/>
- <antcall target="tests-jbossmx-compliance"/>
- <antcall target="tests-jbossmx-implementation"/>
- <antcall target="tests-jbossmx-performance"/>
- <antcall target="tests-iiop"/>
- <antcall target="tests-scout-jaxr"/>
- <antcall target="tests-webservice" />
- <antcall target="tests-aspects"/>
+ <antcall target="tests-standard-unit" inheritRefs="true"/>
+ <antcall target="tests-client-unit" inheritRefs="true"/>
+ <antcall target="tests-security-basic-unit" inheritRefs="true"/>
+ <antcall target="tests-standard-stress" inheritRefs="true"/>
+ <antcall target="tests-jbossmx-compliance" inheritRefs="true"/>
+ <antcall target="tests-jbossmx-implementation" inheritRefs="true"/>
+ <antcall target="tests-jbossmx-performance" inheritRefs="true"/>
+ <antcall target="tests-iiop" inheritRefs="true"/>
+ <antcall target="tests-scout-jaxr" inheritRefs="true"/>
+ <antcall target="tests-webservice" inheritRefs="true"/>
+ <antcall target="tests-aspects" inheritRefs="true"/>
<server:stop name="all"/>
</target>
<target name="smoke-tests"
description="A basic set of units tests which are run against the jboss all config" depends="init">
<server:start name="all"/>
- <antcall target="smoke-tests-raw"/>
+ <antcall target="smoke-tests-raw" inheritRefs="true"/>
<server:stop name="all"/>
</target>
- <target name="tests-profileservice" description="Tests with the full featured profile service">
+ <target name="tests-profileservice" depends="init" description="Tests with the full featured profile service">
<create-profileservice-config baseconf="default" conf="profileservice"/>
<server:start name="profileservice"/>
<run-junit
@@ -1131,13 +1142,13 @@
<create-profileservice-config baseconf="all" conf="embedded"/>
</target>
- <target name="tests-web-profile" description="Tests with the web profile">
+ <target name="tests-web-profile" depends="init" description="Tests with the web profile">
<server:start name="web"/>
- <antcall target="run-web-profile-unit"/>
+ <antcall target="run-web-profile-unit" inheritRefs="true"/>
<server:stop name="web"/>
</target>
- <target name="tests-springdeployer" description="Tests with the full featured spring deployer">
+ <target name="tests-springdeployer" depends="init" description="Tests with the full featured spring deployer">
<create-springdeployer-config baseconf="default" conf="springdeployer"/>
<server:start name="springdeployer"/>
<run-junit junit.patternset="springdeployer.includes" junit.configuration="springdeployer"/>
@@ -1149,7 +1160,7 @@
<!-- Tests of tomcat needing a ssl connector
-->
- <target name="tomcat-ssl-tests"
+ <target name="tomcat-ssl-tests" depends="init"
description="Tomcat tests requiring an SSL connector">
<!-- Create the ssl enabled tomcat config -->
<create-config baseconf="default" newconf="tomcat-ssl">
@@ -1189,7 +1200,7 @@
<!-- Tests of tomcat requiring SSO configured
-->
- <target name="tomcat-sso-tests"
+ <target name="tomcat-sso-tests" depends="init"
description="Tomcat tests requiring SSO configured">
<!-- Create the sso enabled tomcat config starting with the default config -->
<create-config baseconf="default" newconf="tomcat-sso">
@@ -1206,7 +1217,7 @@
<server:stop name="tomcat-sso"/>
</target>
- <target name="tomcat-sso-clustered-tests"
+ <target name="tomcat-sso-clustered-tests" depends="init"
description="Tomcat tests requiring clustered SSO configured">
<!-- Create the sso enabled tomcat config starting with the all config -->
<create-cluster-sso-node newconf="tomcat-sso-cluster0"/>
@@ -1219,7 +1230,7 @@
<server:start name="tomcat-sso-cluster0"/>
<server:start name="tomcat-sso-cluster1"/>
- <antcall target="tests-clustering-unit">
+ <antcall target="tests-clustering-unit" inheritRefs="true">
<param name="cluster.includes.refid" value="tc-sso-clustered.includes"/>
<param name="jboss-junit-configuration" value="tomcat-sso-cluster"/>
</antcall>
@@ -1231,7 +1242,7 @@
</target>
<!-- Tests that require the attribute "UseJBossWebLoader" set to true -->
- <target name="tomcat-webctx-tests"
+ <target name="tomcat-webctx-tests" depends="init"
description="Tomcat tests requiring classloader set to the web loader">
<create-config baseconf="default" newconf="tomcat-webctx"
newconf-src="tomcat-webctx">
@@ -1251,7 +1262,7 @@
<!-- Tests of tomcat requiring Federation configured
-->
- <target name="tomcat-federation-tests"
+ <target name="tomcat-federation-tests" depends="init"
description="Tomcat tests requiring Federation configured">
<!-- Create the federation enabled tomcat config starting with the default config -->
<create-config baseconf="default" newconf="tomcat-federation">
@@ -1281,7 +1292,7 @@
<server:stop name="tomcat-federation"/>
</target>
- <target name="tests-binding-manager"
+ <target name="tests-binding-manager" depends="init"
description="Test for clean startup with service binding manager">
<create-cluster-node conf="binding-manager1"/>
@@ -1299,7 +1310,7 @@
<!--
| Tests ejb calls using the jrmp invoker
-->
- <target name="jrmp-invoker-tests"
+ <target name="jrmp-invoker-tests" depends="init"
description="EJB tests using the jrmp invoker">
<!-- Create the jrmp invoker enabled config -->
<create-config baseconf="default" newconf="jrmp-invoker">
@@ -1321,7 +1332,7 @@
<!--
| Tests ejb calls using the pooled invoker
-->
- <target name="pooled-invoker-tests"
+ <target name="pooled-invoker-tests" depends="init"
description="EJB tests using the jrmp invoker">
<!-- Create the jrmp invoker enabled config -->
<create-config baseconf="default" newconf="pooled-invoker">
@@ -1528,7 +1539,7 @@
| server distribution build.
-->
- <target name="tests-standard-unit">
+ <target name="tests-standard-unit" depends="init">
<echo><![CDATA[
junit.timeout: ${junit.timeout}
jbosstest.iterationcount: ${jbosstest.iterationcount}
@@ -1695,7 +1706,7 @@
| Standard security tests that should run successfully against a default
| JBoss server distribution build.
-->
- <target name="tests-security-basic-unit">
+ <target name="tests-security-basic-unit" depends="init">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
<property name="jbosstest.secure" value="true"/>
@@ -1711,7 +1722,7 @@
<!-- Tests of Java2 permissions. The JBoss server must be running with
a security manager for this test -->
- <target name="tests-security-manager"
+ <target name="tests-security-manager" depends="init"
description="Tests run against a jboss server with a security manager">
<create-config baseconf="default" newconf="secmgr">
@@ -1781,7 +1792,7 @@
</target>
<!-- Tests of the JACC security implementation -->
- <target name="tests-jacc-security"
+ <target name="tests-jacc-security" depends="init"
description="Tests run against a jboss server with JACC configured">
<!-- Create the ssl enabled tomcat config -->
<create-config baseconf="default" newconf="jacc">
@@ -1841,7 +1852,7 @@
<server:stop name="jacc"/>
</target>
- <target name="tests-jacc-securitymgr"
+ <target name="tests-jacc-securitymgr" depends="init"
description="Tests run against a jboss server with JACC configured + security manager">
<!-- Create the security manager enabled jacc -->
<create-config baseconf="default" newconf="jacc-securitymgr" newconf-src="jacc">
@@ -1892,7 +1903,7 @@
<server:stop name="jacc-securitymgr"/>
</target>
- <target name="tests-jacc-security-allstarrole"
+ <target name="tests-jacc-security-allstarrole" depends="init"
description="Tests run against a jboss server with JACC configured + security manager">
<!-- Create the security manager enabled jacc -->
<create-config baseconf="default" newconf="jacc-security-allstarrole" newconf-src="jacc">
@@ -2725,7 +2736,7 @@
<!-- The scoped AOP tests need a classloader hook -->
- <target name="tests-aop-scoped"
+ <target name="tests-aop-scoped" depends="init"
description="AOP tests requiring a native classloader hook">
<!-- copy across the pluggable instrumentor -->
@@ -2746,7 +2757,7 @@
<delete file="${jboss.dist}/bin/pluggable-instrumentor.jar"/>
</target>
- <target name="tests-aop-scoped-generated-advisor"
+ <target name="tests-aop-scoped-generated-advisor" depends="init"
description="AOP tests requiring a native classloader hook for JDK 5.0">
<!-- copy across the pluggable instrumentor -->
@@ -2802,7 +2813,7 @@
<!-- ============================================= JBM Targets ============================= -->
<!-- Starts two servers, run few simultaneous tests, kill the server only once and get the results of all the tests -->
- <target name="tests-jbossmessaging-cluster"
+ <target name="tests-jbossmessaging-cluster" depends="init"
description="Run JBM in cluster">
<delete dir="${jboss.dist}/server/jbm-cluster1" />
@@ -2829,7 +2840,7 @@
<server:start name="jbm-cluster1"/>
<server:start name="jbm-cluster2"/>
- <antcall target="exec-jbmcluster"/>
+ <antcall target="exec-jbmcluster" inheritRefs="true"/>
<!-- I'm not stopping jbm-cluster2 as this server will be killed during the test -->
<server:stop name="jbm-cluster1"/>
@@ -2901,7 +2912,7 @@
<!--
| Run JMS tests against the Messaging JMS provider
-->
- <target name="tests-jbossmessaging"
+ <target name="tests-jbossmessaging" depends="init"
description="Run JMS tests against the Messaging JMS provider">
<!-- Create a separate messaging config -->
@@ -2914,14 +2925,14 @@
</patternset>
</create-config>
<server:start name="jbossmessaging"/>
- <antcall target="tests-jbossmessaging-unit" />
+ <antcall target="tests-jbossmessaging-unit" inheritRefs="true"/>
<server:stop name="jbossmessaging"/>
</target>
<!-- Test the Messaging JMS provider -->
- <target name="tests-jbossmessaging-unit">
+ <target name="tests-jbossmessaging-unit" depends="init">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
<junit dir="${module.output}"
@@ -2972,7 +2983,7 @@
<!-- ========================================= END JBM Targets ============================= -->
- <target name="tests-classloader-leak">
+ <target name="tests-classloader-leak" depends="init">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
@@ -3476,7 +3487,7 @@
<apache location="${apache.location}" action-type="stop"/>
<!-- Test the default UDP stack -->
- <antcall target="tests-clustering-configure">
+ <antcall target="tests-clustering-configure" inheritRefs="true">
<param name="jboss-junit-configuration" value="udp"/>
</antcall>
<server:start name="cluster-udp-0"/>
@@ -3485,7 +3496,7 @@
<server:stop name="cluster-udp-1"/>
<!-- Test a TCP stack.-->
- <antcall target="tests-clustering-configure">
+ <antcall target="tests-clustering-configure" inheritRefs="true">
<param name="jboss-junit-configuration" value="tcp"/>
</antcall>
<server:start name="cluster-tcp-0"/>
@@ -3494,7 +3505,7 @@
<server:stop name="cluster-tcp-1"/>
<!-- Test the field UDP stack -->
- <antcall target="tests-clustering-field-configure">
+ <antcall target="tests-clustering-field-configure" inheritRefs="true">
<param name="cluster.includes.refid" value="cluster.field.includes"/>
<param name="jboss-junit-configuration" value="udp"/>
<param name="jbosstest.cluster.node0.config" value="cluster-field-udp-0"/>
@@ -3506,7 +3517,7 @@
<server:stop name="cluster-field-udp-0"/>
<server:stop name="cluster-field-udp-1"/>
<!-- Test the field TCP stack -->
- <antcall target="tests-clustering-field-configure">
+ <antcall target="tests-clustering-field-configure" inheritRefs="true">
<param name="cluster.includes.refid" value="cluster.field.includes"/>
<param name="jboss-junit-configuration" value="tcp"/>
<param name="jbosstest.cluster.node0.config" value="cluster-field-tcp-0"/>
@@ -3679,7 +3690,7 @@
<sequential>
<start-jboss conf="default" jvmargs="-Xmx128m -Xmx512m -XX:MaxPermSize=512m @{serialization-flag}" java.exec="@{server-jdk}/bin/java"/>
<wait-on-host/>
- <antcall target="tests-standard-unit-matrix-version-pooled">
+ <antcall target="tests-standard-unit-matrix-version-pooled" inheritRefs="true">
<param name="matrix-configuration" value="@{client-version}-@{label}"/>
<param name="junit-jvm-command" value="@{client-jdk}/bin/java"/>
<param name="current-version-dir" value="${matrix-versions}/@{client-version}"/>
@@ -3700,7 +3711,7 @@
<sequential>
<start-jboss conf="default" jvmargs="-Xmx128m -Xmx512m -XX:MaxPermSize=512m @{serialization-flag}" java.exec="@{server-jdk}/bin/java"/>
<wait-on-host/>
- <antcall target="tests-standard-unit-matrix-version">
+ <antcall target="tests-standard-unit-matrix-version" inheritRefs="true">
<param name="matrix-configuration" value="@{client-version}-@{label}"/>
<param name="junit-jvm-command" value="@{client-jdk}/bin/java"/>
<param name="current-version-dir" value="${matrix-versions}/@{client-version}"/>
@@ -3726,7 +3737,7 @@
<attribute name="parameter-filter"/>
<sequential>
<!-- this requires antcall as a property can't be redefined -->
- <antcall target="execute-matrix-unit-target">
+ <antcall target="execute-matrix-unit-target" inheritRefs="true">
<param name="test-name" value="@{test-name}"/>
<param name="parameter-filter" value="@{parameter-filter}"/>
</antcall>
Modified: branches/dml-log-service-integration/testsuite/imports/config/tests-clustering.xml
===================================================================
--- branches/dml-log-service-integration/testsuite/imports/config/tests-clustering.xml 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/testsuite/imports/config/tests-clustering.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -309,7 +309,7 @@
<http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-BR-1"/>
</target>
- <target name="tests-clustered-classloader-leak">
+ <target name="tests-clustered-classloader-leak" depends="init">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
@@ -332,7 +332,7 @@
</target>
- <target name="tests-clustered-profileservice">
+ <target name="tests-clustered-profileservice" depends="init">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
Modified: branches/dml-log-service-integration/testsuite/imports/sections/profileservice.xml
===================================================================
--- branches/dml-log-service-integration/testsuite/imports/sections/profileservice.xml 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/testsuite/imports/sections/profileservice.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -27,6 +27,22 @@
<include name="testEjb2xDeployment-jar.xml"/>
</zipfileset>
</jar>
+ <!-- build testEjb3xMetrics.jar -->
+ <jar destfile="${build.lib}/testEjb3xMetrics.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/profileservice/test/ejb3/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/profileservice/">
+ <include name="testEjb3MetricsQueue-service.xml"/>
+ </fileset>
+ </jar>
+ <!-- build testEjb3Metrics.ear -->
+ <ear destfile="${build.lib}/testEjb3xMetrics.ear"
+ appxml="${build.resources}/profileservice/testEjb3Metrics-application.xml">
+ <fileset dir="${build.lib}">
+ <include name="testEjb3xMetrics.jar"/>
+ </fileset>
+ </ear>
<!-- build testSarDeployment.sar -->
<jar destfile="${build.lib}/testSarDeployment.sar">
<fileset dir="${build.classes}">
Modified: branches/dml-log-service-integration/testsuite/imports/server-config.xml
===================================================================
--- branches/dml-log-service-integration/testsuite/imports/server-config.xml 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/testsuite/imports/server-config.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -1072,6 +1072,9 @@
<fileset dir="${jboss.cache.jbosscache.pojo.lib}">
<include name="jbosscache-pojo.jar"/>
</fileset>
+ <fileset dir="${net.jcip.lib}">
+ <include name="jcip-annotations.jar"/>
+ </fileset>
</copy>
</sequential>
</macrodef>
Modified: branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java
===================================================================
--- branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java 2009-06-29 14:27:52 UTC (rev 90675)
@@ -154,6 +154,7 @@
public void testJBossQL() throws Exception
{
+ boolean ibmJDK = System.getProperty("java.vm.vendor").indexOf("IBM") > -1;
assertEquals("SELECT t0_u.USER_ID FROM USER_DATA t0_u WHERE (ucase(t0_u.USER_NAME) = ?)",
compileJBossQL("SELECT OBJECT(u) FROM user u WHERE UCASE(u.userName) = ?1",
Collection.class, new Class[]{String.class}));
@@ -163,11 +164,17 @@
Collection.class, new Class[]{String.class}));
String expected = "SELECT t0_o1.ORDER_NUMBER FROM ORDER_DATA t0_o1, ORDER_DATA t3_o2, CUSTOMEREJB t2_o2_customer, CUSTOMEREJB t1_o1_customer WHERE (( NOT (t1_o1_customer.id=t2_o2_customer.id)) AND (t0_o1.CC_TYPE=t3_o2.CC_TYPE AND t0_o1.CC_FIRST_NAME=t3_o2.CC_FIRST_NAME AND t0_o1.CC_MI=t3_o2.CC_MI AND t0_o1.CC_LAST_NAME=t3_o2.CC_LAST_NAME AND t0_o1.CC_BILLING_ZIP=t3_o2.CC_BILLING_ZIP AND t0_o1.CC_CARD_NUMBER=t3_o2.CC_CARD_NUMBER) AND t3_o2.customer=t2_o2_customer.id AND t0_o1.customer=t1_o1_customer.id)";
+ String expected_IBM_JDK = "SELECT t0_o1.ORDER_NUMBER FROM ORDER_DATA t0_o1, ORDER_DATA t3_o2, CUSTOMEREJB t1_o1_customer, CUSTOMEREJB t2_o2_customer WHERE (( NOT (t1_o1_customer.id=t2_o2_customer.id)) AND (t0_o1.CC_TYPE=t3_o2.CC_TYPE AND t0_o1.CC_FIRST_NAME=t3_o2.CC_FIRST_NAME AND t0_o1.CC_MI=t3_o2.CC_MI AND t0_o1.CC_LAST_NAME=t3_o2.CC_LAST_NAME AND t0_o1.CC_BILLING_ZIP=t3_o2.CC_BILLING_ZIP AND t0_o1.CC_CARD_NUMBER=t3_o2.CC_CARD_NUMBER) AND t0_o1.customer=t1_o1_customer.id AND t3_o2.customer=t2_o2_customer.id)";
+
String compiled = compileJBossQL(
- "SELECT OBJECT(o1) FROM OrderX o1, OrderX o2 WHERE o1.customer <> o2.customer AND o1.creditCard = o2.creditCard",
- Collection.class, NO_PARAMS);
- assertTrue("Expected: " + expected + " but got: " + compiled, expected.equals(compiled));
+ "SELECT OBJECT(o1) FROM OrderX o1, OrderX o2 WHERE o1.customer <> o2.customer AND o1.creditCard = o2.creditCard", Collection.class, NO_PARAMS);
+ if (ibmJDK) {
+ assertTrue("Expected: " + expected_IBM_JDK + " but got: " + compiled, expected_IBM_JDK.equals(compiled));
+ } else {
+ assertTrue("Expected: " + expected + " but got: " + compiled, expected.equals(compiled));
+ }
+
assertEquals("SELECT t0_o.ORDER_NUMBER " +
"FROM ORDER_DATA t0_o " +
"WHERE ((t0_o.CC_TYPE=? " +
Copied: branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/Ejb3MetricsUnitTestCase.java (from rev 90672, trunk/testsuite/src/main/org/jboss/test/profileservice/test/Ejb3MetricsUnitTestCase.java)
===================================================================
--- branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/Ejb3MetricsUnitTestCase.java (rev 0)
+++ branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/Ejb3MetricsUnitTestCase.java 2009-06-29 14:27:52 UTC (rev 90675)
@@ -0,0 +1,582 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.test.profileservice.test;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.jboss.deployers.spi.management.ManagementView;
+import org.jboss.deployers.spi.management.deploy.DeploymentManager;
+import org.jboss.deployers.spi.management.deploy.DeploymentProgress;
+import org.jboss.managed.api.ComponentType;
+import org.jboss.managed.api.ManagedComponent;
+import org.jboss.managed.api.ManagedOperation;
+import org.jboss.managed.api.ManagedProperty;
+import org.jboss.metatype.api.values.CompositeValue;
+import org.jboss.metatype.api.values.SimpleValue;
+import org.jboss.test.profileservice.test.ejb3.TestLoggingMDB;
+import org.jboss.test.profileservice.test.ejb3.TestStatefulBean;
+import org.jboss.test.profileservice.test.ejb3.TestStatelessBean;
+
+/**
+ * Ejb3MetricsUnitTestCase
+ *
+ * Asserts that ManagementObjects and corresponding
+ * properties/operations are exposed in expected form for
+ * EJB3 SLSBs, SFSBs, and MDBs.
+ *
+ * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
+ * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
+ * @version $Revision$
+ */
+public class Ejb3MetricsUnitTestCase extends AbstractProfileServiceTest
+{
+
+ // ---------------------------------------------------------------------------------------||
+ // Class Members -------------------------------------------------------------------------||
+ // ---------------------------------------------------------------------------------------||
+
+ /**
+ * Component type for the EJB3 namespace
+ */
+ private static final String COMPONENT_TYPE_EJB3 = "EJB3";
+
+ /**
+ * Component subtype for Stateless Session Beans
+ */
+ private static final String COMPONENT_SUBTYPE_STATELESS_SESSION = "StatelessSession";
+
+ /**
+ * Component subtype for Stateful Session Beans
+ */
+ private static final String COMPONENT_SUBTYPE_STATEFUL_SESSION = "StatefulSession";
+
+ /**
+ * Component subtype for Message-Driven Beans
+ */
+ private static final String COMPONENT_SUBTYPE_MESSAGE_DRIVEN = "MessageDriven";
+
+ /**
+ * Properties which should be exposed by SLSB MOs.
+ */
+ private static final String[] PROPERTY_NAMES_SLSB = new String[]
+ {
+ // general EJB metrics
+ "name", "invocationStats",
+ // session bean specific metrics
+ "availableCount", "createCount", "currentSize", "maxSize", "removeCount"};
+
+ /**
+ * Properties which should be exposed by SFSB MOs.
+ */
+ private static final String[] PROPERTY_NAMES_SFSB = new String[]
+ {
+ // general EJB metrics
+ "name", "invocationStats",
+ // session bean specific metrics
+ "availableCount", "createCount", "currentSize", "maxSize", "removeCount",
+ // stateful session bean specific metrics
+ "cacheSize", "passivatedCount", "totalSize"};
+
+ /**
+ * Properties which should be exposed by MDB MOs.
+ */
+ private static final String[] PROPERTY_NAMES_MDB = new String[]
+ {
+ // general EJB metrics
+ "name", "invocationStats",
+ // message-driven bean specific metrics
+ "deliveryActive", "keepAliveMillis", "maxMessages", "maxPoolSize", "minPoolSize"};
+
+ /**
+ * Operations which should be exposed by SLSB MOs
+ */
+ private static final String[] OPERATION_NAMES_SLSB = new String[]
+ {"resetInvocationStats"};
+
+ /**
+ * Operations which should be exposed by SFSB MOs
+ */
+ private static final String[] OPERATION_NAMES_SFSB = new String[]
+ {"resetInvocationStats"};
+
+ /**
+ * Operations which should be exposed by MDB MOs
+ */
+ private static final String[] OPERATION_NAMES_MDB = new String[]
+ {"resetInvocationStats", "startDelivery", "stopDelivery"};
+
+ /**
+ * The name of the test EAR to deploy
+ */
+ private static final String NAME_TEST_EAR = "testEjb3xMetrics.ear";
+
+ /**
+ * The name of the test JAR to deploy
+ */
+ private static final String NAME_TEST_JAR = "testEjb3xMetrics.jar";
+
+ // ---------------------------------------------------------------------------------------||
+ // Instance Members ----------------------------------------------------------------------||
+ // ---------------------------------------------------------------------------------------||
+
+ /**
+ * The hook to ManagementObjects
+ */
+ private ManagementView managementView;
+
+ /**
+ * Profile Service deployer; required to get things in management view
+ */
+ private DeploymentManager deploymentManager;
+
+ /**
+ * Repository names from the deployment
+ */
+ private String[] repositoryNames;
+
+ // ---------------------------------------------------------------------------------------||
+ // Constructor ---------------------------------------------------------------------------||
+ // ---------------------------------------------------------------------------------------||
+
+ /**
+ * Constructor
+ *
+ * @param name
+ */
+ public Ejb3MetricsUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ // ---------------------------------------------------------------------------------------||
+ // Lifecycle -----------------------------------------------------------------------------||
+ // ---------------------------------------------------------------------------------------||
+
+ /**
+ * Deploys the test JAR via the ProfileService-aware DeploymentManager
+ */
+ @Override
+ protected void setUp() throws Exception
+ {
+ // Call Super
+ super.setUp();
+
+ // Get the Deployment Manager
+ deploymentManager = this.getDeploymentManager();
+
+ // Set the Management View
+ managementView = this.getManagementView();
+ }
+
+ /**
+ * Undeploys the test JAR
+ */
+ @Override
+ protected void tearDown() throws Exception
+ {
+ // Undeploy the test JAR
+ log.info("Undeploying: " + repositoryNames);
+ final DeploymentProgress stopProgress = deploymentManager.stop(repositoryNames);
+ stopProgress.run();
+ final DeploymentProgress removeProgress = deploymentManager.remove(repositoryNames);
+ removeProgress.run();
+
+ // Null out
+ repositoryNames = null;
+ deploymentManager = null;
+ managementView = null;
+
+ // Call super
+ super.tearDown();
+ }
+
+ // ---------------------------------------------------------------------------------------||
+ // Tests ---------------------------------------------------------------------------------||
+ // ---------------------------------------------------------------------------------------||
+
+ /**
+ * Ensures that MOs with the correct metrics and operations are exposed for SLSBs.
+ *
+ * @throws Exception
+ */
+ public void testSlsb() throws Exception
+ {
+ // Log
+ this.getLog().info("testSlsb");
+
+ // Deploy
+ this.deployTestJar();
+
+ // Ensure component exists.
+ final String ejbName = TestStatelessBean.class.getSimpleName();
+ final String componentName = NAME_TEST_JAR + '/' + ejbName;
+ final ManagedComponent component = this.getAndTestManagedComponent(COMPONENT_SUBTYPE_STATELESS_SESSION, componentName);
+
+ // Check component has expected props and ops.
+ this.ensureManagementPropertiesExposed(component, PROPERTY_NAMES_SLSB);
+ this.ensureManagementOperationsExposed(component, OPERATION_NAMES_SLSB);
+
+ validateInvocationStats(component);
+ }
+
+ /**
+ * Ensures that MOs with the correct metrics and operations are exposed for SFSBs.
+ *
+ * @throws Exception
+ */
+ public void testSfsb() throws Exception
+ {
+ // Log
+ this.getLog().info("testSfsb");
+
+ // Deploy
+ this.deployTestJar();
+
+ // Ensure component exists.
+ final String ejbName = TestStatefulBean.class.getSimpleName();
+ final String componentName = NAME_TEST_JAR + '/' + ejbName;
+ final ManagedComponent component = this.getAndTestManagedComponent(COMPONENT_SUBTYPE_STATEFUL_SESSION, componentName);
+
+ // Check component has expected props and ops.
+ this.ensureManagementPropertiesExposed(component, PROPERTY_NAMES_SFSB);
+ this.ensureManagementOperationsExposed(component, OPERATION_NAMES_SFSB);
+
+ validateInvocationStats(component);
+ }
+
+ /**
+ * Ensures that the managed component names of
+ * EJB3 deployments in an EAR have form:
+ *
+ * "EARName/JARName/EJBName"
+ */
+ public void testEarManagedComponentNames() throws Exception
+ {
+ // Log
+ this.getLog().info("testEarManagedComponentNames");
+
+ // Deploy the EAR (it will be undeployed and cleaned up as part of test lifecycle)
+ final String deployName = NAME_TEST_EAR;
+ final URL contentURL = super.getDeployURL(deployName);
+ this.deploy(deployName, contentURL);
+
+ // Generate expected names
+ final String earName = NAME_TEST_EAR;
+ final char delimiter = '/';
+ final String jarName = NAME_TEST_JAR;
+ final String componentPrefix = earName + delimiter + jarName + delimiter;
+ final String slsbComponentName = componentPrefix + TestStatelessBean.class.getSimpleName();
+ final String sfsbComponentName = componentPrefix + TestStatefulBean.class.getSimpleName();
+ final String mdbComponentName = componentPrefix + TestLoggingMDB.class.getSimpleName();
+
+ // Test
+ this.getAndTestManagedComponent(COMPONENT_SUBTYPE_STATELESS_SESSION, slsbComponentName);
+ this.getAndTestManagedComponent(COMPONENT_SUBTYPE_STATEFUL_SESSION, sfsbComponentName);
+ this.getAndTestManagedComponent(COMPONENT_SUBTYPE_MESSAGE_DRIVEN, mdbComponentName);
+ }
+
+ /**
+ * Ensures that MOs with the correct metrics and operations are exposed for MDBs.
+ *
+ * @throws Exception
+ */
+ public void testMdb() throws Exception
+ {
+ // Log
+ this.getLog().info("testMdb");
+
+ // Deploy
+ this.deployTestJar();
+
+ // Ensure component exists.
+ final String ejbName = TestLoggingMDB.class.getSimpleName();
+ final String componentName = NAME_TEST_JAR + '/' + ejbName;
+ final ManagedComponent component = this.getAndTestManagedComponent(COMPONENT_SUBTYPE_MESSAGE_DRIVEN, componentName);
+
+ // Check component has expected props and ops.
+ this.ensureManagementPropertiesExposed(component, PROPERTY_NAMES_MDB);
+ this.ensureManagementOperationsExposed(component, OPERATION_NAMES_MDB);
+
+ validateInvocationStats(component);
+ }
+
+ // ---------------------------------------------------------------------------------------||
+ // Internal Helper Methods ---------------------------------------------------------------||
+ // ---------------------------------------------------------------------------------------||
+
+ /**
+ * Deploys the specified URL under the specified deployment name
+ * using the profile service; this is required such that ManagedObjects will
+ * be found (which is not the case using traditional JMX deployment)
+ *
+ * @param deployName
+ * @param url
+ * @throws Exception
+ */
+ protected void deploy(final String deployName, final URL url) throws Exception
+ {
+ // Deploy
+ final DeploymentProgress distributeProgress = deploymentManager.distribute(deployName, url, true);
+ distributeProgress.run();
+ repositoryNames = distributeProgress.getDeploymentID().getRepositoryNames();
+ final DeploymentProgress startProgress = deploymentManager.start(repositoryNames);
+ log.info("Deploying: " + repositoryNames);
+ startProgress.run();
+
+ // Reset the Management View
+ managementView = this.getManagementView();
+ }
+
+ /**
+ * Deploys the test JAR
+ *
+ * @throws Exception
+ */
+ protected void deployTestJar() throws Exception
+ {
+ // Deploy the test JAR
+ final String deployName = NAME_TEST_JAR;
+ final URL contentURL = super.getDeployURL(deployName);
+ this.deploy(deployName, contentURL);
+ }
+
+ /**
+ * Obtains the component of the specified subtype and name, failing the test if not found
+ *
+ * @param componentSubType
+ * @param componentName
+ * @throws IllegalArgumentException If any of the arguments were not specified
+ * @throws Exception If a general error occured
+ */
+ protected ManagedComponent getAndTestManagedComponent(final String componentSubType, final String componentName)
+ throws Exception
+ {
+ // Log
+ this.getLog().info("getAndTestManagedComponent");
+
+ // Precondition checks
+ if (componentSubType == null || componentSubType.length() == 0)
+ {
+ throw new IllegalArgumentException("componentSubType must be specified");
+ }
+ if (componentName == null || componentName.length() == 0)
+ {
+ throw new IllegalArgumentException("componentName must be specified");
+ }
+
+ // Get the SLSB Type
+ final ComponentType componentType = new ComponentType(COMPONENT_TYPE_EJB3, componentSubType);
+ final Set<ManagedComponent> components = managementView.getComponentsForType(componentType);
+
+ // Get SLSB
+ final Iterator<ManagedComponent> componentsIt = components.iterator();
+ ManagedComponent component = null;
+ while (componentsIt.hasNext())
+ {
+ // Obtain the next component
+ final ManagedComponent currentComponent = componentsIt.next();
+ final String name = currentComponent.getName();
+
+ // Ensure it's the component we're looking for
+ if (name.equals(componentName))
+ {
+ component = currentComponent;
+ break;
+ }
+ }
+
+ // Ensure we've got the component
+ if (component == null)
+ {
+ TestCase.fail("Component not found; no managed object with name \"" + componentName + "\" in: " + components);
+ }
+
+ // Obtains the Component
+ return component;
+ }
+
+ /**
+ * Ensures that the specified management properties are exposed for
+ * the specified component
+ *
+ * @param The component
+ * @param expectedProperties Properties expected to be exposed by the specified component
+ * @throws IllegalArgumentException If any of the arguments are blank or null
+ * @throws Exception
+ */
+ protected void ensureManagementPropertiesExposed(final ManagedComponent component, final String[] expectedProperties)
+ throws IllegalArgumentException, Exception
+ {
+
+ // Log
+ this.getLog().info("ensureManagementPropertiesExposed");
+
+ // Precondition checks
+ if (component == null)
+ {
+ throw new IllegalArgumentException("component must be specified");
+ }
+ if (expectedProperties == null)
+ {
+ throw new IllegalArgumentException("expectedProperties must be specified");
+ }
+
+ // Ensure all expected properties are in place
+ for (final String expectedProperty : expectedProperties)
+ {
+ final ManagedProperty prop = component.getProperty(expectedProperty);
+ TestCase.assertNotNull("Component did not contain expected managed property \"" + expectedProperty + "\": "
+ + component, prop);
+ }
+ }
+
+ /**
+ * Ensures that the specified management operations are exposed for
+ * the specified component
+ *
+ * @param The component
+ * @param expectedOperationNames Operation names expected to be exposed by the specified component
+ * @throws IllegalArgumentException If any of the arguments are blank or null
+ * @throws Exception
+ */
+ protected void ensureManagementOperationsExposed(final ManagedComponent component,
+ final String[] expectedOperationNames) throws IllegalArgumentException, Exception
+ {
+
+ // Log
+ this.getLog().info("ensureManagementOperationsExposed");
+
+ // Precondition checks
+ if (component == null)
+ {
+ throw new IllegalArgumentException("component must be specified");
+ }
+ if (expectedOperationNames == null)
+ {
+ throw new IllegalArgumentException("expectedProperties must be specified");
+ }
+
+ // Obtain managed operations for this component
+ final Set<ManagedOperation> operations = component.getOperations();
+
+ // For all expected operations
+ for (final String expectedOperation : expectedOperationNames)
+ {
+ // Ensure it's exposed
+ boolean found = false;
+ for (final ManagedOperation currentOperation : operations)
+ {
+ if (currentOperation.getName().equals(expectedOperation))
+ {
+ found = true;
+ break;
+ }
+ }
+
+ // Ensure the operation was found
+ TestCase.assertTrue("Component did not contain expected managed operation \"" + expectedOperation + "\": "
+ + component, found);
+ }
+ }
+
+ protected void validateInvocationStats(ManagedComponent component)
+ {
+ // TODO: Invoke some methods on the EJB to populate some stats.
+ InvocationStats invocationStats = getInvocationStats(component);
+ // TODO: Check that the stats have the expected values.
+ resetInvocationStats(component);
+ invocationStats = getInvocationStats(component);
+ // TODO: Check that the stats were reset.
+ }
+
+ private InvocationStats getInvocationStats(ManagedComponent component)
+ {
+ InvocationStats invocationStats = new InvocationStats();
+ List<MethodStats> allMethodStats = new ArrayList<MethodStats>();
+ ManagedProperty invocationStatsProp = component.getProperty("invocationStats");
+ invocationStats.endTime = System.currentTimeMillis();
+ CompositeValue invocationStatsMetaValue = (CompositeValue) invocationStatsProp.getValue();
+ CompositeValue allMethodStatsMetaValue = (CompositeValue) invocationStatsMetaValue.get("methodStats");
+ Set<String> methodNames = allMethodStatsMetaValue.getMetaType().keySet();
+ for (String methodName : methodNames)
+ {
+ CompositeValue methodStatsMetaValue = (CompositeValue) allMethodStatsMetaValue.get(methodName);
+ MethodStats methodStats = new MethodStats();
+ methodStats.name = methodName;
+ methodStats.count = Long.parseLong(((SimpleValue) methodStatsMetaValue.get("count")).getValue().toString());
+ methodStats.totalTime = Long.parseLong(((SimpleValue) methodStatsMetaValue.get("totalTime")).getValue()
+ .toString());
+ methodStats.minTime = Long
+ .parseLong(((SimpleValue) methodStatsMetaValue.get("minTime")).getValue().toString());
+ methodStats.maxTime = Long
+ .parseLong(((SimpleValue) methodStatsMetaValue.get("maxTime")).getValue().toString());
+ allMethodStats.add(methodStats);
+ }
+ invocationStats.methodStats = allMethodStats;
+
+ SimpleValue lastResetTimeMetaValue = (SimpleValue) invocationStatsMetaValue.get("lastResetTime");
+ invocationStats.beginTime = Long.valueOf(lastResetTimeMetaValue.getValue().toString()); // TODO: handle null value?
+
+ return invocationStats;
+ }
+
+ private void resetInvocationStats(ManagedComponent component)
+ {
+ Set<ManagedOperation> operations = component.getOperations();
+ for (ManagedOperation operation : operations)
+ {
+ if (operation.getName().equals("resetInvocationStats"))
+ {
+ operation.invoke();
+ break;
+ }
+ }
+ }
+
+ class InvocationStats
+ {
+ List<MethodStats> methodStats;
+
+ long beginTime;
+
+ long endTime;
+ }
+
+ class MethodStats
+ {
+ String name;
+
+ long count;
+
+ long minTime;
+
+ long maxTime;
+
+ long totalTime;
+ }
+}
Copied: branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3 (from rev 90672, trunk/testsuite/src/main/org/jboss/test/profileservice/test/ejb3)
Deleted: branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLocalBusiness.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLocalBusiness.java 2009-06-29 14:11:47 UTC (rev 90672)
+++ branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLocalBusiness.java 2009-06-29 14:27:52 UTC (rev 90675)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.test.profileservice.test.ejb3;
-
-/**
- * TestLocalBusiness
- *
- * Local Business Interface of a test EJB
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public interface TestLocalBusiness
-{
- // No business methods required
-}
Copied: branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLocalBusiness.java (from rev 90672, trunk/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLocalBusiness.java)
===================================================================
--- branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLocalBusiness.java (rev 0)
+++ branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLocalBusiness.java 2009-06-29 14:27:52 UTC (rev 90675)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.test.profileservice.test.ejb3;
+
+/**
+ * TestLocalBusiness
+ *
+ * Local Business Interface of a test EJB
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+public interface TestLocalBusiness
+{
+ // No business methods required
+}
Deleted: branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLoggingMDB.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLoggingMDB.java 2009-06-29 14:11:47 UTC (rev 90672)
+++ branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLoggingMDB.java 2009-06-29 14:27:52 UTC (rev 90675)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.test.profileservice.test.ejb3;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-
-import org.jboss.ejb3.annotation.Depends;
-import org.jboss.logging.Logger;
-
-/**
- * TestLoggingMDB
- *
- * Message-Driven Bean used in testing of the EJB3 Metrics exposure
- * via the Profile Service @ManagementObjects
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
- at MessageDriven(activationConfig =
-{@ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/ejb3MetricsTestQueue")})
- at Depends("jboss.mq.destination:service=Queue,name=ejb3MetricsTestQueue")
-public class TestLoggingMDB implements MessageListener
-{
-
- //-------------------------------------------------------------------------------------||
- // Class Members ----------------------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- /**
- * Logger
- */
- private static final Logger log = Logger.getLogger(TestLoggingMDB.class);
-
- //-------------------------------------------------------------------------------------||
- // Required Implementations -----------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- /* (non-Javadoc)
- * @see javax.jms.MessageListener#onMessage(javax.jms.Message)
- */
- public void onMessage(final Message message)
- {
- // Just log
- log.info("Received message: " + message);
- }
-
-}
Copied: branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLoggingMDB.java (from rev 90672, trunk/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLoggingMDB.java)
===================================================================
--- branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLoggingMDB.java (rev 0)
+++ branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLoggingMDB.java 2009-06-29 14:27:52 UTC (rev 90675)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.test.profileservice.test.ejb3;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+import org.jboss.ejb3.annotation.Depends;
+import org.jboss.logging.Logger;
+
+/**
+ * TestLoggingMDB
+ *
+ * Message-Driven Bean used in testing of the EJB3 Metrics exposure
+ * via the Profile Service @ManagementObjects
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+ at MessageDriven(activationConfig =
+{@ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
+ @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/ejb3MetricsTestQueue")})
+ at Depends("jboss.mq.destination:service=Queue,name=ejb3MetricsTestQueue")
+public class TestLoggingMDB implements MessageListener
+{
+
+ //-------------------------------------------------------------------------------------||
+ // Class Members ----------------------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
+ /**
+ * Logger
+ */
+ private static final Logger log = Logger.getLogger(TestLoggingMDB.class);
+
+ //-------------------------------------------------------------------------------------||
+ // Required Implementations -----------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
+ /* (non-Javadoc)
+ * @see javax.jms.MessageListener#onMessage(javax.jms.Message)
+ */
+ public void onMessage(final Message message)
+ {
+ // Just log
+ log.info("Received message: " + message);
+ }
+
+}
Deleted: branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatefulBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatefulBean.java 2009-06-29 14:11:47 UTC (rev 90672)
+++ branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatefulBean.java 2009-06-29 14:27:52 UTC (rev 90675)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.test.profileservice.test.ejb3;
-
-import javax.ejb.Local;
-import javax.ejb.Stateful;
-
-/**
- * TestStatefulBean
- *
- * A test SFSB with no business methods
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
- at Stateful
- at Local(TestLocalBusiness.class)
-public class TestStatefulBean implements TestLocalBusiness
-{
- // No business methods required
-}
Copied: branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatefulBean.java (from rev 90672, trunk/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatefulBean.java)
===================================================================
--- branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatefulBean.java (rev 0)
+++ branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatefulBean.java 2009-06-29 14:27:52 UTC (rev 90675)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.test.profileservice.test.ejb3;
+
+import javax.ejb.Local;
+import javax.ejb.Stateful;
+
+/**
+ * TestStatefulBean
+ *
+ * A test SFSB with no business methods
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+ at Stateful
+ at Local(TestLocalBusiness.class)
+public class TestStatefulBean implements TestLocalBusiness
+{
+ // No business methods required
+}
Deleted: branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatelessBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatelessBean.java 2009-06-29 14:11:47 UTC (rev 90672)
+++ branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatelessBean.java 2009-06-29 14:27:52 UTC (rev 90675)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.test.profileservice.test.ejb3;
-
-import javax.ejb.Local;
-import javax.ejb.Stateless;
-
-/**
- * TestStatelessBean
- *
- * A test SLSB with no business methods
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
- at Stateless
- at Local(TestLocalBusiness.class)
-public class TestStatelessBean implements TestLocalBusiness
-{
- // No business methods required
-}
Copied: branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatelessBean.java (from rev 90672, trunk/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatelessBean.java)
===================================================================
--- branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatelessBean.java (rev 0)
+++ branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestStatelessBean.java 2009-06-29 14:27:52 UTC (rev 90675)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.test.profileservice.test.ejb3;
+
+import javax.ejb.Local;
+import javax.ejb.Stateless;
+
+/**
+ * TestStatelessBean
+ *
+ * A test SLSB with no business methods
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+ at Stateless
+ at Local(TestLocalBusiness.class)
+public class TestStatelessBean implements TestLocalBusiness
+{
+ // No business methods required
+}
Modified: branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java
===================================================================
--- branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java 2009-06-29 14:27:52 UTC (rev 90675)
@@ -38,6 +38,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
+import java.util.Properties;
import javax.management.ObjectName;
import javax.net.ServerSocketFactory;
import javax.net.ssl.SSLServerSocket;
@@ -63,7 +64,11 @@
{
static final String JAR = "https-service.sar";
static final String KEYSTORE_PASSWORD = "unit-tests";
+ private static final String PROP_FILE_NAME = "security-provider.properties";
+ private static final String PROP_NAME_PREFIX = "jsse.provider.class.";
+ private static final Logger log = Logger.getLogger(HttpsUnitTestCase.class);
+
public HttpsUnitTestCase(String name)
{
super(name);
@@ -168,7 +173,10 @@
{
super.setUp();
deploy(JAR);
- Security.addProvider(SecurityProviderUtil.getJSSEProvider());
+ String jsseProviderName = getJSSEProviderName();
+ Class providerClass = Class.forName(jsseProviderName);
+ java.security.Provider provider = (java.security.Provider)providerClass.newInstance();
+ Security.addProvider(provider);
}
protected void tearDown() throws Exception
{
@@ -179,6 +187,45 @@
return wrapper;
}
+ private static String getJSSEProviderName() {
+
+ String jsseProviderName = null;
+
+ try {
+
+ Properties prop = new Properties();
+ prop.load(ClassLoader.getSystemResourceAsStream(PROP_FILE_NAME));
+
+ boolean searched = false;
+ int i=1;
+ while (!searched){
+ boolean found = prop.containsKey(PROP_NAME_PREFIX + i);
+ if (found){
+ String jsseProvider = prop.getProperty(PROP_NAME_PREFIX + i);
+ try {
+ Class.forName(jsseProvider);
+ jsseProviderName = jsseProvider;
+ log.debug ("Using JSEE Provider :" + jsseProvider);
+ } catch (ClassNotFoundException cnfe){
+ log.debug ("Could not find JSEE Provider :" + jsseProvider );
+ }
+
+ } else {
+ searched = true;
+ }
+ i++;
+ }
+ if (jsseProviderName == null) {
+ log.error ("No JSSE Providers found. Please add the appropriate provider in security-providers.properties");
+ }
+ } catch (Exception e){
+ log.error ("Error getting JSSE Provider : ");
+ e.printStackTrace();
+ }
+ return jsseProviderName;
+ }
+
+
/** A subclass of Thread that processes a single request sent to
the serverSocket.
*/
Copied: branches/dml-log-service-integration/testsuite/src/resources/profileservice/testEjb3Metrics-application.xml (from rev 90672, trunk/testsuite/src/resources/profileservice/testEjb3Metrics-application.xml)
===================================================================
--- branches/dml-log-service-integration/testsuite/src/resources/profileservice/testEjb3Metrics-application.xml (rev 0)
+++ branches/dml-log-service-integration/testsuite/src/resources/profileservice/testEjb3Metrics-application.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/application_5.xsd"
+ version="5">
+ <description>EJB3 Metrics EAR Test</description>
+ <display-name>testEjb3Metrics</display-name>
+ <module>
+ <ejb>testEjb3xMetrics.jar</ejb>
+ </module>
+</application>
Copied: branches/dml-log-service-integration/testsuite/src/resources/profileservice/testEjb3MetricsQueue-service.xml (from rev 90672, trunk/testsuite/src/resources/profileservice/testEjb3MetricsQueue-service.xml)
===================================================================
--- branches/dml-log-service-integration/testsuite/src/resources/profileservice/testEjb3MetricsQueue-service.xml (rev 0)
+++ branches/dml-log-service-integration/testsuite/src/resources/profileservice/testEjb3MetricsQueue-service.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.mq.destination:service=Queue,name=ejb3MetricsTestQueue">
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+
+</server>
\ No newline at end of file
Copied: branches/dml-log-service-integration/testsuite/src/resources/security-provider.properties (from rev 90672, trunk/testsuite/src/resources/security-provider.properties)
===================================================================
--- branches/dml-log-service-integration/testsuite/src/resources/security-provider.properties (rev 0)
+++ branches/dml-log-service-integration/testsuite/src/resources/security-provider.properties 2009-06-29 14:27:52 UTC (rev 90675)
@@ -0,0 +1,9 @@
+# Specifies a list of possible jsse provider classes.
+# Numbers must start from 1 upwards and denotes priority.
+jsse.provider.class.1 com.sun.net.ssl.internal.ssl.Provider
+jsse.provider.class.2 com.ibm.jsse.IBMJSSEProvider
+
+# Specifies a list of possible www protocol classes.
+# Numbers must start from 1 upwards and denotes priority.
+www.protocol.class.1 com.sun.net.ssl.internal.www.protocol
+www.protocol.class.2 com.ibm.net.ssl.internal.www.protocol
Modified: branches/dml-log-service-integration/thirdparty/pom.xml
===================================================================
--- branches/dml-log-service-integration/thirdparty/pom.xml 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/thirdparty/pom.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -81,21 +81,6 @@
<copySources>true</copySources>
</configuration>
</execution>
- <execution>
- <id>build-thirparty-testsuite</id>
- <goals>
- <goal>build-thirdparty</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}</outputDirectory>
- <librariesEnt>${basedir}/testsuite-libraries.ent</librariesEnt>
- <aliasesEnt>${basedir}/../tools/etc/buildmagic/aliases.ent</aliasesEnt>
- <includedScopes>
- <scope>test</scope>
- </includedScopes>
- <copySources>true</copySources>
- </configuration>
- </execution>
</executions>
<configuration>
<mappedDependencies>
Modified: branches/dml-log-service-integration/tools/etc/buildmagic/aliases.ent
===================================================================
--- branches/dml-log-service-integration/tools/etc/buildmagic/aliases.ent 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/tools/etc/buildmagic/aliases.ent 2009-06-29 14:27:52 UTC (rev 90675)
@@ -4,7 +4,6 @@
<path id="apache.commons.classpath">
<pathelement path="${apache.collections.lib}/commons-collections.jar"/>
<pathelement path="${apache.logging.lib}/commons-logging.jar"/>
- <pathelement path="${apache.httpclient.lib}/commons-httpclient.jar"/>
<pathelement path="${apache.discovery.lib}/commons-discovery.jar"/>
<pathelement path="${apache.fileupload.lib}/commons-fileupload.jar"/>
<pathelement path="${apache.lang.lib}/commons-lang.jar"/>
Deleted: branches/dml-log-service-integration/tools/etc/buildmagic/libraries.ent
===================================================================
--- branches/dml-log-service-integration/tools/etc/buildmagic/libraries.ent 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/tools/etc/buildmagic/libraries.ent 2009-06-29 14:27:52 UTC (rev 90675)
@@ -1,630 +0,0 @@
-<!-- $Id$ -->
-
- <!-- Spring -->
- <property name="spring.root" value="${project.thirdparty}/spring"/>
- <property name="spring.lib" value="${spring.root}/lib"/>
- <path id="spring.classpath">
- <pathelement path="${spring.lib}/spring-beans.jar"/>
- <pathelement path="${spring.lib}/spring-core.jar"/>
- <pathelement path="${spring.lib}/spring-context.jar"/>
- </path>
- <path id="spring-example.classpath">
- <pathelement path="${spring.lib}/spring-aop.jar"/>
- <pathelement path="${spring.lib}/spring-web.jar"/>
- <pathelement path="${spring.lib}/spring-webmvc.jar"/>
- </path>
-
- <!-- Dom4j -->
- <property name="dom4j.dom4j.root" value="${project.thirdparty}/dom4j-dom4j"/>
- <property name="dom4j.dom4j.lib" value="${dom4j.dom4j.root}/lib"/>
- <path id="dom4j.dom4j.classpath">
- <pathelement path="${dom4j.dom4j.lib}/dom4j.jar"/>
- </path>
-
- <!-- Properties used for transtion to thirdparty build -->
- <property name="jaxen.jaxen.lib" value="${dom4j.dom4j.root}/lib"/>
-
- <!-- Javassist -->
- <property name="javassist.root" value="${project.thirdparty}/javassist"/>
- <property name="javassist.lib" value="${javassist.root}/lib"/>
- <path id="javassist.classpath">
- <pathelement path="${javassist.lib}/javassist.jar"/>
- </path>
-
- <!-- qdox -->
- <property name="qdox.root" value="${project.thirdparty}/qdox"/>
- <property name="qdox.lib" value="${qdox.root}/lib"/>
- <path id="qdox.classpath">
- <pathelement path="${qdox.lib}/qdox.jar"/>
- </path>
-
- <!-- hibernate3 -->
- <property name="hibernate.root" value="${project.thirdparty}/hibernate"/>
- <property name="hibernate.lib" value="${hibernate.root}/lib"/>
- <path id="hibernate3.classpath">
- <pathelement path="${hibernate.lib}/hibernate3.jar"/>
- <pathelement path="${hibernate.lib}/asm.jar"/>
- <pathelement path="${hibernate.lib}/asm-attrs.jar"/>
- <pathelement path="${hibernate.lib}/antlr*.jar"/>
- </path>
-
- <!-- hibernate entity manager -->
- <property name="hibernate.entitymanager.root" value="${project.thirdparty}/hibernate"/>
- <property name="hibernate.entitymanager.lib" value="${hibernate.entitymanager.root}/lib"/>
- <path id="hibernate.entitymanager.classpath">
- <pathelement path="${hibernate.entitymanager.lib}/ejb3-persistence.jar"/>
- <pathelement path="${hibernate.entitymanager.lib}/hibernate-entitymanager.jar"/>
- </path>
-
- <!-- hibernate annotations manager -->
- <property name="hibernate.annotations.root" value="${project.thirdparty}/hibernate"/>
- <property name="hibernate.annotations.lib" value="${hibernate.annotations.root}/lib"/>
- <path id="hibernate.annotations.classpath">
- <pathelement path="${hibernate.annotations.lib}/hibernate-annotations.jar"/>
- </path>
-
- <!-- asm alias used for bridging to thirdparty build-->
- <property name="asm.asm.root" value="${project.thirdparty}/hibernate"/>
- <property name="asm.asm.lib" value="${asm.asm.root}/lib/"/>
- <property name="asm.asm.resources" value="${asm.asm.root}/resources/"/>
- <path id="asm.asm.classpath">
- <pathelement path="${asm.asm.lib}/asm.jar"/>
- <pathelement path="${asm.asm.lib}/asm-attrs.jar"/>
- </path>
-
-
- <!-- ejb3-persistence -->
- <path id="ejb3-persistence.classpath">
- <pathelement path="${hibernate.lib}/hibernate-annotations.jar"/>
- <pathelement path="${hibernate.lib}/hibernate-entitymanager.jar"/>
- <pathelement path="${hibernate.lib}/ejb3-persistence.jar"/>
- </path>
-
- <!-- ODMG (needed for Hibernate) -->
- <property name="odmg.root" value="${project.thirdparty}/odmg"/>
- <property name="odmg.lib" value="${odmg.root}/lib"/>
- <path id="odmg.classpath">
- <pathelement path="${odmg.lib}/odmg-3.0.jar"/>
- </path>
-
- <!-- CGLIB (needed for Hibernate) -->
- <property name="cglib.root" value="${project.thirdparty}/cglib"/>
- <property name="cglib.lib" value="${cglib.root}/lib"/>
- <path id="cglib.classpath">
- <pathelement path="${cglib.lib}/cglib-2.1.1.jar"/>
- </path>
-
-
- <!-- Trove -->
- <property name="trove.root" value="${project.thirdparty}/trove"/>
- <property name="trove.lib" value="${trove.root}/lib"/>
- <path id="trove.classpath">
- <pathelement path="${trove.lib}/trove.jar"/>
- </path>
-
- <!-- Ant -->
- <property name="apache.ant.root" value="${project.tools}"/>
- <property name="apache.ant.lib" value="${apache.ant.root}/lib"/>
- <path id="apache.ant.classpath">
- <pathelement path="${apache.ant.lib}/ant.jar"/>
- </path>
-
- <!-- Apache Avalon -->
- <property name="apache.avalon.root" value="${project.thirdparty}/apache-avalon"/>
- <property name="apache.avalon.lib" value="${apache.avalon.root}/lib"/>
- <path id="apache.avalon.classpath">
- <pathelement path="${apache.avalon.lib}/avalon-framework.jar"/>
- </path>
- <property name="apache.avalon.logkit.lib" value="${apache.avalon.lib}"/>
- <path id="apache.avalon.logkit.classpath">
- <pathelement path="${apache.avalon.logkit.lib}/logkit.jar"/>
- </path>
-
- <!-- Apache BCEL -->
- <property name="apache.bcel.root" value="${project.thirdparty}/apache-bcel"/>
- <property name="apache.bcel.lib" value="${apache.bcel.root}/lib"/>
- <path id="apache.bcel.classpath">
- <pathelement path="${apache.bcel.lib}/bcel.jar"/>
- </path>
-
- <!-- Apache Commons -->
- <property name="apache.commons.root" value="${project.thirdparty}/apache-commons"/>
- <property name="apache.commons.lib" value="${apache.commons.root}/lib"/>
- <path id="apache.commons.classpath">
- <pathelement path="${apache.commons.lib}/commons-collections.jar"/>
- <pathelement path="${apache.commons.lib}/commons-logging.jar"/>
- <pathelement path="${apache.commons.lib}/commons-httpclient.jar"/>
- <pathelement path="${apache.commons.lib}/commons-pool.jar"/>
- <pathelement path="${apache.commons.lib}/commons-discovery.jar"/>
- <pathelement path="${apache.commons.lib}/commons-fileupload.jar"/>
- <pathelement path="${apache.commons.lib}/commons-lang-2.0.jar"/>
- <pathelement path="${apache.commons.lib}/commons-vfs.jar"/>
- </path>
-
- <!-- Properties used for transtion to thirdparty build -->
- <property name="apache.collections.lib" value="${apache.commons.root}/lib"/>
- <property name="apache.codec.lib" value="${apache.commons.root}/lib"/>
- <property name="apache.beanutils.lib" value="${apache.commons.root}/lib"/>
- <property name="apache.digester.lib" value="${apache.commons.root}/lib"/>
- <property name="apache.httpclient.lib" value="${apache.commons.root}/lib"/>
- <property name="apache.logging.lib" value="${apache.commons.root}/lib"/>
- <property name="apache.pool.lib" value="${apache.commons.root}/lib"/>
- <property name="apache.fileupload.lib" value="${apache.commons.root}/lib"/>
- <property name="apache.lang.lib" value="${apache.commons.root}/lib"/>
- <property name="apache.vfs.lib" value="${apache.commons.root}/lib"/>
- <property name="apache.discovery.lib" value="${apache.commons.root}/lib"/>
- <property name="apache.validator.lib" value="${apache.commons.root}/lib"/>
- <property name="apache.logging.api.lib" value="${apache.commons.root}/lib"/>
-
- <path id="apache.httpclient.classpath">
- <pathelement path="${apache.commons.lib}/commons-httpclient.jar"/>
- </path>
-
- <path id="apache.logging.classpath">
- <pathelement path="${apache.commons.lib}/commons-logging.jar"/>
- </path>
-
- <path id="apache.beanutils.classpath">
- <pathelement path="${apache.commons.lib}/commons-beanutils.jar"/>
- </path>
-
- <path id="apache.validator.classpath">
- <pathelement path="${apache.commons.lib}/commons-validator-1.1.3.jar"/>
- </path>
-
- <!-- Apache Log4j -->
- <property name="apache.log4j.root" value="${project.thirdparty}/apache-log4j"/>
- <property name="apache.log4j.lib" value="${apache.log4j.root}/lib"/>
- <path id="apache.log4j.classpath">
- <pathelement path="${apache.log4j.lib}/log4j.jar"/>
- </path>
-
- <!-- Apache Lucene -->
- <property name="apache.lucene.root"
- value="${project.thirdparty}/apache-lucene"/>
- <property name="apache.lucene.lib" value="${apache.lucene.root}/lib"/>
- <path id="apache.lucene.classpath">
- <pathelement path="${apache.lucene.lib}/lucene.jar"/>
- </path>
-
- <!-- Apache Myfaces -->
- <property name="apache.myfaces.root"
- value="${project.thirdparty}/apache-myfaces"/>
- <property name="apache.myfaces.lib" value="${apache.myfaces.root}/lib"/>
-
- <!-- Apache Tomcat 5.5.x -->
- <property name="apache.tomcat55.root" value="${project.thirdparty}/apache-tomcat55"/>
- <property name="apache.tomcat55.lib" value="${apache.tomcat55.root}"/>
- <path id="apache.tomcat55.classpath">
- <fileset dir="${apache.tomcat55.root}">
- <include name="*.jar" />
- </fileset>
- </path>
-
- <!-- Apache commons-el -->
- <property name="commons.el.root" value="${apache.tomcat55.root}"/>
- <property name="commons.el.lib" value="${apache.tomcat55.root}"/>
- <path id="commons.el.classpath">
- <pathelement path="${commons.el.lib}/commons-el.jar"/>
- </path>
-
- <!-- Apache Modeler -->
- <property name="apache.modeler.root" value="${project.thirdparty}/apache-tomcat55"/>
- <property name="apache.modeler.lib" value="${apache.modeler.root}"/>
- <path id="apache.modeler.classpath">
- <fileset dir="${apache.modeler.root}">
- <include name="commons-modeler.jar" />
- </fileset>
- </path>
-
- <!-- Apache Velocity -->
- <property name="apache.velocity.root" value="${project.thirdparty}/apache-velocity"/>
- <property name="apache.velocity.lib" value="${apache.velocity.root}/lib"/>
- <path id="apache.velocity.classpath">
- <pathelement path="${apache.velocity.lib}/velocity.jar"/>
- </path>
-
- <!-- Apache Xerces -->
- <property name="apache.xerces.root" value="${project.thirdparty}/apache-xerces"/>
- <property name="apache.xerces.lib" value="${apache.xerces.root}/lib"/>
- <path id="apache.xerces.classpath">
- <pathelement path="${apache.xerces.lib}/xml-apis.jar"/>
- <pathelement path="${apache.xerces.lib}/xercesImpl.jar"/>
- <pathelement path="${apache.xerces.lib}/resolver.jar"/>
- </path>
-
- <!-- Apache Xalan -->
- <property name="apache.xalan.root" value="${project.thirdparty}/apache-xalan"/>
- <property name="apache.xalan.lib" value="${apache.xalan.root}/lib"/>
- <path id="apache.xalan.classpath">
- <pathelement path="${apache.xalan.lib}/xalan.jar"/>
- <path refid="apache.xerces.classpath"/>
- </path>
-
- <!-- Apache Scout -->
- <property name="apache.scout.root" value="${project.thirdparty}/apache-scout"/>
- <property name="apache.scout.lib" value="${apache.scout.root}/lib"/>
- <path id="apache.scout.classpath">
- <pathelement path="${apache.scout.lib}/scout.jar"/>
- </path>
-
- <!-- Apache Slide -->
- <property name="apache.slide.root" value="${project.thirdparty}/apache-slide"/>
- <property name="apache.slide.lib" value="${apache.slide.root}/client/lib"/>
- <path id="apache.slide.classpath">
- <pathelement path="${apache.slide.lib}/webdavlib.jar"/>
- <pathelement path="${apache.slide.lib}/commons-httpclient.jar"/>
- </path>
-
- <!-- Apache JaxMe2 -->
- <property name="apache.jaxme.root" value="${project.thirdparty}/apache-jaxme"/>
- <property name="apache.jaxme.lib" value="${apache.jaxme.root}/lib"/>
- <path id="apache.jaxme.classpath">
- <pathelement path="${apache.jaxme.lib}/jaxmexs.jar"/>
- </path>
-
- <!-- Apache WSS4J -->
- <property name="apache.wss4j.root" value="${project.thirdparty}/apache-wss4j"/>
- <property name="apache.wss4j.lib" value="${apache.wss4j.root}/lib"/>
- <path id="apache.wss4j.classpath">
- <pathelement path="${apache.wss4j.lib}/wss4j.jar"/>
- </path>
-
- <!-- XML Security XMLSec -->
- <property name="xml.security.root" value="${project.thirdparty}/xml-security"/>
- <property name="xml.security.lib" value="${xml.security.root}/lib"/>
- <path id="xml.security.classpath">
- <pathelement path="${xml.security.lib}/xmlsec.jar"/>
- </path>
-
- <!-- Bouncy Castle JCE Provider -->
- <property name="bouncycastle.root" value="${project.thirdparty}/bouncycastle"/>
- <property name="bouncycastle.lib" value="${bouncycastle.root}/lib"/>
- <path id="bouncycastle.classpath">
- <pathelement path="${bouncycastle.lib}/bcprov-jdk14-122.jar"/>
- </path>
-
- <!-- OpenSAML -->
- <property name="opensaml.root" value="${project.thirdparty}/opensaml"/>
- <property name="opensaml.lib" value="${opensaml.root}/lib"/>
- <path id="opensaml.classpath">
- <pathelement path="${opensaml.lib}/opensaml.jar"/>
- </path>
-
- <!-- GNU Regex -->
- <property name="gnu.regexp.root" value="${project.thirdparty}/gnu-regexp"/>
- <property name="gnu.regexp.lib" value="${gnu.regexp.root}/lib"/>
- <path id="gnu.regexp.classpath">
- <pathelement path="${gnu.regexp.lib}/gnu-regexp.jar"/>
- </path>
-
- <!-- GNU Getopt -->
- <property name="gnu.getopt.root" value="${project.thirdparty}/gnu-getopt"/>
- <property name="gnu.getopt.lib" value="${gnu.getopt.root}/lib"/>
- <path id="gnu.getopt.classpath">
- <pathelement path="${gnu.getopt.lib}/getopt.jar"/>
- </path>
-
- <!-- org.jdom -->
- <property name="jdom.root" value="${project.thirdparty}/jdom-beta-7"/>
- <property name="jdom.lib" value="${jdom.root}/lib"/>
- <path id="jdom.classpath">
- <pathelement path="${jdom.lib}/jdom.jar"/>
- </path>
-
- <!-- JBoss -->
- <property name="jboss.external.root" value="${project.thirdparty}/jboss"/>
- <property name="jboss.remoting.root" value="${jboss.external.root}/remoting"/>
- <property name="jboss.remoting.lib" value="${jboss.remoting.root}/lib"/>
- <path id="jboss.remoting.classpath">
- <pathelement path="${jboss.remoting.lib}/jboss-remoting.jar"/>
- </path>
- <property name="jboss.serialization.root" value="${jboss.external.root}/serialization"/>
- <property name="jboss.serialization.lib" value="${jboss.serialization.root}/lib"/>
- <path id="jboss.serialization.classpath">
- <pathelement path="${jboss.serialization.lib}/jboss-serialization.jar"/>
- </path>
- <property name="jboss.axis.root" value="${jboss.external.root}/axis"/>
- <property name="jboss.axis.lib" value="${jboss.axis.root}/lib"/>
- <path id="jboss.axis.classpath">
- <pathelement path="${jboss.axis.lib}/axis-ws4ee.jar"/>
- </path>
- <property name="jboss.web.root" value="${jboss.external.root}/web"/>
- <property name="jboss.web.lib" value="${jboss.web.root}/lib"/>
- <path id="jboss.web.classpath">
- <pathelement path="${jboss.web.lib}/jbossweb.jar"/>
- </path>
-
- <!-- JUnit -->
- <property name="junit.junit.root" value="${project.thirdparty}/junit-junit"/>
- <property name="junit.junit.lib" value="${junit.junit.root}/lib"/>
- <path id="junit.junit.classpath">
- <pathelement path="${junit.junit.lib}/junit.jar"/>
- </path>
-
- <!-- EDU.oswego.cs.dl.util.concurrent -->
- <property name="oswego.concurrent.root" value="${project.thirdparty}/oswego-concurrent"/>
- <property name="oswego.concurrent.lib" value="${oswego.concurrent.root}/lib"/>
- <path id="oswego.concurrent.classpath">
- <pathelement path="${oswego.concurrent.lib}/concurrent.jar"/>
- </path>
-
- <!-- org.xml.sax (SAX2 & SAX2 Extensions) -->
- <property name="sax.root" value="${project.thirdparty}/xml-sax"/>
- <property name="sax.lib" value="${sax.root}/lib"/>
- <path id="sax.classpath">
- <pathelement path="${sax.lib}/sax2.jar"/>
- <pathelement path="${sax.lib}/sax2-ext.jar"/>
- </path>
-
- <!-- IBM WSDL4j -->
- <property name="ibm.wsdl4j.root" value="${project.thirdparty}/ibm-wsdl4j"/>
- <property name="ibm.wsdl4j.lib" value="${ibm.wsdl4j.root}/lib"/>
- <path id="ibm.wsdl4j.classpath">
- <pathelement path="${ibm.wsdl4j.lib}/wsdl4j.jar"/>
- </path>
-
- <!-- GJT JPL-Util -->
- <property name="gjt.jpl-util.root" value="${project.thirdparty}/gjt-jpl-util"/>
- <property name="gjt.jpl-util.lib" value="${gjt.jpl-util.root}/lib"/>
- <path id="gjt.jpl-util.classpath">
- <pathelement path="${gjt.jpl-util.lib}/jpl-util.jar"/>
- <pathelement path="${gjt.jpl-util.lib}/jpl-pattern.jar"/>
- </path>
-
- <!-- Hypersonic SQL -->
- <property name="hsqldb.hsqldb.root" value="${project.thirdparty}/hsqldb-hsqldb"/>
- <property name="hsqldb.hsqldb.lib" value="${hsqldb.hsqldb.root}/lib"/>
- <path id="hsqldb.hsqldb.classpath">
- <pathelement path="${hsqldb.hsqldb.lib}/hsqldb.jar"/>
- </path>
-
- <!-- JacORB -->
- <property name="jacorb.jacorb.root" value="${project.thirdparty}/jacorb-jacorb"/>
- <property name="jacorb.jacorb.lib" value="${jacorb.jacorb.root}/lib"/>
- <path id="jacorb.jacorb.classpath">
- <pathelement path="${jacorb.jacorb.lib}/jacorb.jar"/>
- </path>
- <path id="jacorb.idl.classpath">
- <path refid="apache.avalon.logkit.classpath"/>
- <pathelement path="${jacorb.jacorb.lib}/idl.jar"/>
- </path>
- <property name="jacorb.idl.include" value="${jacorb.jacorb.root}/idl"/>
- <property name="jacorb.jacorb.resources" value="${jacorb.jacorb.root}/conf/default"/>
-
- <!-- JGroups -->
- <property name="jgroups.jgroups.root" value="${project.thirdparty}/javagroups-javagroups"/>
- <property name="jgroups.jgroups.lib" value="${jgroups.jgroups.root}/lib"/>
- <path id="jgroups.jgroups.classpath">
- <pathelement path="${jgroups.jgroups.lib}/jgroups.jar"/>
- </path>
-
- <!-- Sleepycat -->
- <property name="sleepycat.root" value="${project.thirdparty}/sleepycat"/>
- <property name="sleepycat.lib" value="${sleepycat.root}/lib"/>
- <path id="sleepycat.classpath">
- <pathelement path="${sleepycat.lib}/je.jar"/>
- </path>
-
- <!-- JUnitEJB -->
- <property name="junitejb.junitejb.root" value="${project.thirdparty}/junitejb/junitejb"/>
- <property name="junitejb.junitejb.lib" value="${junitejb.junitejb.root}/lib"/>
- <path id="junitejb.junitejb.classpath">
- <pathelement path="${junitejb.junitejb.lib}/junitejb.jar"/>
- </path>
-
- <!-- Sun JavaBeans Activation Framework (JAF) -->
- <property name="sun.jaf.root" value="${project.thirdparty}/sun-jaf"/>
- <property name="sun.jaf.lib" value="${sun.jaf.root}/lib"/>
- <path id="sun.jaf.classpath">
- <pathelement path="${sun.jaf.lib}/activation.jar"/>
- </path>
-
- <!-- Sun JavaMail -->
- <property name="sun.javamail.root" value="${project.thirdparty}/sun-javamail"/>
- <property name="sun.javamail.lib" value="${sun.javamail.root}/lib"/>
- <path id="sun.javamail.classpath">
- <pathelement path="${sun.javamail.lib}/mail.jar"/>
- </path>
-
- <!-- Sun Java XML Parser (JAXP) -->
- <property name="sun.jaxp.root" value="${project.thirdparty}/sun-jaxp"/>
- <property name="sun.jaxp.lib" value="${sun.jaxp.root}/lib"/>
- <path id="sun.jaxp.classpath">
- <pathelement path="${sun.jaxp.lib}/jaxp.jar"/>
- <pathelement path="${sun.jaxp.lib}/crimson.jar"/>
- <pathelement path="${sun.jaxp.lib}/xalan.jar"/>
- </path>
-
- <!-- Sun Java Media Framework (JMF) -->
- <property name="sun.jmf.root" value="${project.thirdparty}/sun-jmf"/>
- <property name="sun.jmf.lib" value="${sun.jmf.root}/lib"/>
- <path id="sun.jmf.classpath">
- <pathelement path="${sun.jmf.lib}/jmf.jar"/>
- </path>
-
- <!-- Sun Java Management Extensions (JMX) -->
- <property name="sun.jmx.root" value="${project.thirdparty}/sun-jmx"/>
- <property name="sun.jmx.lib" value="${sun.jmx.root}/lib"/>
- <path id="sun.jmx.classpath">
- <pathelement path="${sun.jmx.lib}/jmxri.jar"/>
- <pathelement path="${sun.jmx.lib}/jmxtools.jar"/>
- </path>
-
- <!-- Sun Open Source XACML Implementation -->
- <property name="sun.xacml.root" value="${project.thirdparty}/sun-xacml"/>
- <property name="sun.xacml.lib" value="${sun.xacml.root}/lib"/>
- <path id="sun.xacml.classpath">
- <pathelement path="${sun.xacml.lib}/sunxacml.jar"/>
- <pathelement path="${sun.xacml.lib}/sunxacml-support.jar"/>
- </path>
-
- <!-- JavaCC -->
- <property name="sun.javacc.root" value="${project.thirdparty}/sun-javacc"/>
- <property name="sun.javacc.lib" value="${sun.javacc.root}/lib"/>
-
- <!-- BeanShell -->
- <property name="beanshell.beanshell.root" value="${project.thirdparty}/beanshell-beanshell"/>
- <property name="beanshell.beanshell.lib" value="${beanshell.beanshell.root}/lib"/>
- <path id="beanshell.beanshell.classpath">
- <fileset dir="${beanshell.beanshell.lib}">
- <include name="*.jar" />
- </fileset>
- </path>
-
- <!-- Joe SNMP lib -->
- <property name="opennms.joesnmp.root" value="${project.thirdparty}/opennms/joesnmp"/>
- <property name="opennms.joesnmp.lib" value="${opennms.joesnmp.root}/lib"/>
- <path id="opennms.joesnmp.classpath">
- <pathelement path="${opennms.joesnmp.lib}/joesnmp.jar"/>
- </path>
-
- <!-- XDoclet -->
-
- <!--
- | xdoclet has appended a version string to all their jars.
- | I'm using jb4 so we don't have to track them so carefully
- -->
- <property name="xdoclet.version" value="jb4"/>
-
- <!--
-
- jason: it seems like this hack is better defaulting to the default in thirdparty, if you
- want to build from CVS then change this to the value below in build/local.properties.
-
- <!- - this may be overridden by the build/local.properties file to use version from cvs- ->
- <property name="xdoclet.xdoclet.root" value="${project.root}/xdoclet/output"/>
-
- -->
- <property name="xdoclet.xdoclet.root" value="${project.thirdparty}/xdoclet-xdoclet"/>
-
- <property name="xdoclet.xdoclet.lib" value="${xdoclet.xdoclet.root}/lib"/>
- <path id="xdoclet.xdoclet.classpath">
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-xjavadoc-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-bea-module-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-ejb-module-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-java-module-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-jboss-module-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-jdo-module-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-jmx-module-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-web-module-${xdoclet.version}.jar"/>
- <pathelement path="${xdoclet.xdoclet.lib}/xdoclet-xdoclet-module-${xdoclet.version}.jar"/>
- <path refid="apache.commons.classpath"/>
- <path refid="jboss.web.classpath"/>
- </path>
- <path id="xdoclet.task.classpath">
- <path refid="xdoclet.xdoclet.classpath"/>
- </path>
-
- <!-- Informa RSS -->
- <property name="informa.rss.root" value="${project.thirdparty}/informa-rss"/>
- <property name="informa.rss.lib" value="${informa.rss.root}/lib"/>
- <path id="informa.rss.classpath">
- <pathelement path="${informa.rss.lib}/informa.jar"/>
- </path>
-
- <!-- JRegex -->
- <property name="jregex.jregex.root" value="${project.thirdparty}/jregex-jregex"/>
- <property name="jregex.jregex.lib" value="${jregex.jregex.root}/lib"/>
- <path id="jregex.jregex.classpath">
- <pathelement path="${jregex.jregex.lib}/jregex.jar"/>
- </path>
-
- <!-- DNSJava -->
- <property name="sourceforge.dnsjava.root" value="${project.thirdparty}/sourceforge-dnsjava"/>
- <property name="sourceforge.dnsjava.lib" value="${sourceforge.dnsjava.root}/lib"/>
- <path id="sourceforge.dnsjava.classpath">
- <pathelement path="${sourceforge.dnsjava.lib}/dnsjava-1.4.3.jar"/>
- </path>
-
- <!-- M.Wutka's DTD parser -->
- <property name="wutka.dtdparser.root" value="${project.thirdparty}/wutka-dtdparser"/>
- <property name="wutka.dtdparser.lib" value="${wutka.dtdparser.root}/lib"/>
- <path id="wutka.dtdparser.classpath">
- <pathelement path="${wutka.dtdparser.lib}/dtdparser121.jar"/>
- </path>
-
- <!-- JFreeChart -->
- <property name="jfreechart.jfreechart.root" value="${project.thirdparty}/jfreechart"/>
- <property name="jfreechart.jfreechart.lib" value="${jfreechart.jfreechart.root}/lib"/>
- <path id="jfreechart.jfreechart.classpath">
- <fileset dir="${jfreechart.jfreechart.lib}">
- <include name="*.jar" />
- </fileset>
- </path>
-
- <!-- ebxmlrr -->
- <property name="ebxmlrr.ebxmlrr.root" value="${project.thirdparty}/sun-ebxmlrr"/>
- <property name="ebxmlrr.ebxmlrr.lib" value="${ebxmlrr.ebxmlrr.root}/lib"/>
- <path id="ebxmlrr.ebxmlrr.classpath">
- <pathelement path="${ebxmlrr.ebxmlrr.lib}/ebxmlrr.jar"/>
- <pathelement path="${ebxmlrr.ebxmlrr.lib}/jaxr-client.jar"/>
- </path>
-
- <!-- ANTLR -->
- <property name="antlr.antlr.root" value="${project.thirdparty}/antlr"/>
- <property name="antlr.antlr.lib" value="${antlr.antlr.root}/lib"/>
- <path id="antlr.antlr.classpath">
- <pathelement path="${antlr.antlr.lib}/antlr-2.7.5H3.jar"/>
- </path>
-
- <!-- Apache Taglibs -->
- <property name="apache.taglibs.root" value="${project.thirdparty}/apache-taglibs"/>
- <property name="apache.taglibs.lib" value="${apache.taglibs.root}/lib"/>
- <path id="apache.taglibs.classpath">
- <pathelement path="${apache.taglibs.lib}/jstl-1.1.2.jar"/>
- <pathelement path="${apache.taglibs.lib}/standard-1.1.2.jar"/>
- </path>
-
- <!-- Apache ORO -->
- <property name="apache.oro.root" value="${project.thirdparty}/apache-oro"/>
- <property name="apache.oro.lib" value="${apache.oro.root}/lib"/>
- <path id="apache.oro.classpath">
- <pathelement path="${apache.oro.lib}/jakarta-oro-2.0.8.jar"/>
- </path>
-
- <!-- Apache Struts -->
- <property name="apache.struts.root" value="${project.thirdparty}/apache-struts"/>
- <property name="apache.struts.lib" value="${apache.struts.root}/lib"/>
- <path id="apache.struts.classpath">
- <pathelement path="${apache.struts.lib}/struts-1.2.6.jar"/>
- </path>
-
- <!-- StAX -->
- <property name="codehaus.stax.root" value="${project.thirdparty}/codehaus-stax"/>
- <property name="codehaus.stax.lib" value="${codehaus.stax.root}/lib"/>
- <path id="codehaus.stax.classpath">
- <pathelement path="${codehaus.stax.lib}/stax-1.1.1.jar"/>
- </path>
-
- <!-- XMLUnit -->
- <property name="xmlunit.xmlunit.root" value="${project.thirdparty}/xmlunit-xmlunit"/>
- <property name="xmlunit.xmlunit.lib" value="${xmlunit.xmlunit.root}/lib"/>
- <path id="xmlunit.xmlunit.classpath">
- <pathelement path="${xmlunit.xmlunit.lib}/xmlunit1.0.jar"/>
- </path>
-
- <!-- easymock -->
- <property name="easymock.easymock.root" value="${project.thirdparty}/easymock"/>
- <property name="easymock.easymock.lib" value="${easymock.easymock.root}/lib/"/>
- <property name="easymock.easymock.resources" value="${easymock.easymock.root}/resources/"/>
- <path id="easymock.easymock.classpath">
- <pathelement path="${easymock.easymock.lib}/easymockclassextension.jar"/>
- <pathelement path="${easymock.easymock.lib}/easymock-1.1.jar"/>
- </path>
-
- <!-- struts-test-case -->
- <property name="struts.test.case.root" value="${project.thirdparty}/struts-test-case"/>
- <property name="struts.test.case.lib" value="${struts.test.case.root}/lib/"/>
- <property name="struts.test.case.resources" value="${struts.test.case.root}/resources/"/>
- <path id="struts.test.case.classpath">
- <pathelement path="${struts.test.case.lib}/strutstest-2.1.3.jar"/>
- </path>
-
- <!-- cache -->
- <property name="jboss.cache.root" value="${project.thirdparty}/jboss/cache"/>
- <property name="jboss.cache.lib" value="${jboss.cache.root}/lib"/>
- <path id="jboss.cache.classpath">
- <pathelement path="${jboss.cache.lib}/jboss-cache.jar"/>
- </path>
Modified: branches/dml-log-service-integration/tools/maven/ant-tasks/maven-ant-tasks-2.1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Deleted: branches/dml-log-service-integration/varia/build-sars.xml
===================================================================
--- branches/dml-log-service-integration/varia/build-sars.xml 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/varia/build-sars.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
- <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
-]>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, The Home of Professional Open Source -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-
-<!-- $Id$ -->
-
-<project default="build-sars" name="JBoss/Varia">
-
- <target name="init">
- <property name="project.thirdparty" location="../thirdparty"/>
- &libraries;
- </target>
-
- <target name="build-sars" description="create sar files" depends="init">
-
- <property name="build.lib" location="target"/>
- <property name="build.classes" location="target/classes"/>
- <property name="build.etc" location="target/etc"/>
- <property name="build.resources" location="target/resources"/>
-
- <!-- deployment-service.sar -->
- <jar jarfile="${build.lib}/deployment-service.sar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.resources}/services/deployment">
- <include name="META-INF/**"/>
- </fileset>
- <fileset dir="${build.lib}">
- <include name="deployment-service.jar"/>
- </fileset>
- <fileset dir="${apache.collections.lib}">
- <include name="commons-collections.jar"/>
- </fileset>
- <fileset dir="${apache.velocity.lib}">
- <include name="velocity.jar"/>
- </fileset>
- </jar>
-
- <!-- foe-deployer.sar -->
- <jar jarfile="${build.lib}/foe-deployer-3.2.sar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/varia/deployment/Foe**"/>
- <include name="org/jboss/varia/deployment/convertor/**"/>
- </fileset>
- <fileset dir="${build.resources}/deployment">
- <include name="META-INF/**"/>
- <include name="resources/6.1/**"/>
- </fileset>
- <fileset dir="${build.etc}">
- <include name="foe-deployer-service.xml"/>
- </fileset>
- </jar>
-
- <!-- persistent-service.sar -->
- <!-- demo service for docs/examples -->
- <jar jarfile="${build.lib}/persistent-service.sar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/jmx/examples/persistence/**"/>
- </fileset>
- <fileset dir="${build.resources}/jmx/examples/persistent-service"/>
- </jar>
-
- <!-- mbean-configurator-service.sar -->
- <!-- demo service for docs/examples -->
- <!-- shows how to set attributes on registered mbean from file -->
- <jar jarfile="${build.lib}/mbean-configurator.sar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/jmx/examples/configuration/**"/>
- </fileset>
- <fileset dir="${build.resources}/jmx/examples/mbean-configurator-service"/>
- </jar>
-
- <!-- http-invoker.sar + war -->
- <zip destfile="${build.lib}/http-invoker.sar">
- <zipfileset dir="${build.resources}/services/invoker/http"
- prefix="invoker.war/WEB-INF">
- <include name="jboss-web.xml" />
- <include name="web.xml" />
- </zipfileset>
- <zipfileset dir="${build.classes}" prefix="invoker.war/WEB-INF/classes">
- <include name="org/jboss/invocation/http/**"/>
- </zipfileset>
- <zipfileset dir="${build.resources}/services/invoker/http"
- prefix="META-INF">
- <include name="jboss-service.xml" />
- </zipfileset>
- </zip>
-
- <!-- httpha-invoker.sar + war -->
- <zip destfile="${build.lib}/httpha-invoker.sar">
- <zipfileset dir="${build.resources}/services/invoker/httpha"
- prefix="invoker.war/WEB-INF">
- <include name="jboss-web.xml" />
- <include name="jboss-scanning.xml" />
- <include name="web.xml" />
- </zipfileset>
- <zipfileset dir="${build.classes}" prefix="invoker.war/WEB-INF/classes">
- <include name="org/jboss/invocation/http/**"/>
- </zipfileset>
- <zipfileset dir="${build.resources}/services/invoker/httpha"
- prefix="META-INF">
- <include name="jboss-service.xml" />
- <include name="jboss-scanning.xml" />
- </zipfileset>
- </zip>
-
- <!-- snmp-adaptor.sar containing snmp-adaptor.jar -->
- <jar jarfile="${build.lib}/snmp-adaptor.sar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.resources}/services/snmp/deploy"/>
- <fileset dir="${build.lib}">
- <include name="jboss-as-varia-snmp-adaptor.jar"/>
- </fileset>
- </jar>
-
- <!-- build deployers -->
-
- <property name="build.deployers" location="target/deployers"/>
- <property name="source.resources" location="src/resources"/>
-
- <mkdir dir="${build.deployers}/bsh.deployer"/>
- <mkdir dir="${build.deployers}/bsh.deployer/META-INF"/>
-
- <jar jarfile="${build.deployers}/bsh.deployer/bsh-deployer.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/varia/deployment/BeanShell**"/>
- <include name="org/jboss/varia/deployment/Script**"/>
- <include name="org/jboss/varia/deployment/Test**"/>
- <include name="org/jboss/varia/deployment/Legacy**"/>
- </fileset>
- </jar>
-
- <copy todir="${build.deployers}/bsh.deployer/META-INF">
- <fileset file="${source.resources}/beanshell/bsh-deployers-jboss-beans.xml"/>
- </copy>
-
- <!-- seam.deployer -->
- <mkdir dir="${build.deployers}/seam.deployer"/>
- <mkdir dir="${build.deployers}/seam.deployer/META-INF"/>
-
- <copy todir="${build.deployers}/seam.deployer/META-INF">
- <fileset dir="${source.resources}/seam">
- <include name="*.xml"/>
- </fileset>
- </copy>
-
- <copy todir="${build.deployers}/seam.deployer">
- <fileset dir="${org.jboss.seam.integration.lib}">
- <include name="jboss-seam-int-microcontainer.jar"/>
- </fileset>
- </copy>
-
- <!-- jboss-bean.deployer -->
- <mkdir dir="${build.lib}/kernel/jboss-bean.deployer"/>
- <copy todir="${build.lib}/kernel/jboss-bean.deployer" filtering="no">
- <fileset file="${build.lib}/jboss-bean-deployer.jar"/>
- <fileset dir="${jboss.microcontainer.lib}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${jboss.microcontainer.lib}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${jboss.microcontainer.lib}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${build.resources}/kernel">
- <include name="**/*.xml"/>
- </fileset>
- </copy>
-
- </target>
-
-</project>
Deleted: branches/dml-log-service-integration/varia/build.xml
===================================================================
--- branches/dml-log-service-integration/varia/build.xml 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/varia/build.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -1,750 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
- <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
- <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
-]>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, The Home of Professional Open Source -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-
-<!-- $Id$ -->
-
-<project default="main" name="JBoss/Varia">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <!--
- | Include the common Buildmagic elements.
- |
- | This defines several different targets, properties and paths.
- | It also sets up the basic extention tasks amoung other things.
- -->
-
- &buildmagic;
-
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <!--
- | Initialize the build system. Must depend on '_buildmagic:init'.
- | Other targets should depend on 'init' or things will mysteriously fail.
- -->
-
- <target name="init" unless="init.disable" depends="_buildmagic:init">
- </target>
-
-
- <!-- ================================================================== -->
- <!-- Configuration -->
- <!-- ================================================================== -->
-
- <!--
- | Configure the build system.
- |
- | This target is invoked by the Buildmagic initialization logic and
- | should contain module specific configuration elements.
- -->
-
- <target name="configure" unless="configure.disable">
-
- <!-- =================== -->
- <!-- Basic Configuration -->
- <!-- =================== -->
-
- <!-- Module name(s) & version -->
- <property name="module.name" value="varia"/>
- <property name="module.Name" value="Various"/>
-
- <!-- ========= -->
- <!-- Libraries -->
- <!-- ========= -->
-
- &libraries;
-
- <!-- The combined library classpath -->
- <path id="library.classpath">
- <path refid="sun.jaf.classpath"/>
- <path refid="sun.javamail.classpath"/>
- <path refid="sun.jaxb.classpath"/>
- <path refid="jboss.web.classpath"/>
- <path refid="apache.bsf.classpath"/>
- <path refid="apache.commons.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="apache.xerces.classpath"/>
- <path refid="apache.velocity.classpath"/>
- <path refid="junit.junit.classpath"/>
- <path refid="hsqldb.hsqldb.classpath"/>
- <path refid="apache.ant.classpath"/>
- <path refid="beanshell.beanshell.classpath"/>
- <path refid="opennms.joesnmp.classpath"/>
- <path refid="opensaml.opensaml.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="juddi.juddi.classpath"/>
- <path refid="jboss.metadata.classpath"/>
- <path refid="jboss.jboss.deployers.classpath"/>
- <path refid="jboss.jboss.man.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
- <path refid="org.jboss.ws.native.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
- <path refid="jboss.integration.classpath"/>
- <path refid="org.jboss.cluster.classpath"/>
- <path refid="jboss.jboss.vfs.classpath"/>
- </path>
-
- <!-- ======= -->
- <!-- Modules -->
- <!-- ======= -->
-
- &modules;
- <!-- The combined dependent module classpath -->
- <path id="dependentmodule.classpath">
- <path refid="jboss.jboss.javaee.classpath"/>
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.common.logging.spi.classpath"/>
- <path refid="jboss.common.logging.log4j.classpath"/>
- <path refid="jboss.common.logging.jdk.classpath"/>
- <path refid="jboss.cluster.classpath"/>
- <path refid="jboss.jboss.bootstrap.classpath"/>
- <path refid="jboss.system.classpath"/>
- <path refid="jboss.systemjmx.classpath"/>
- <path refid="jboss.mx.classpath"/>
- <path refid="jboss.jnpserver.classpath"/>
- <path refid="jboss.server.classpath"/>
- <path refid="jboss.jbosssx.classpath"/>
- </path>
-
- <!-- ===== -->
- <!-- Tasks -->
- <!-- ===== -->
-
- <!-- Where source files live -->
- <property name="source.java" value="${module.source}/main"/>
- <property name="source.etc" value="${module.source}/etc"/>
- <property name="source.resources" value="${module.source}/resources"/>
-
- <!-- Where build generated files will go -->
- <property name="build.classes" value="${module.output}/classes"/>
- <property name="build.lib" value="${module.output}/lib"/>
- <property name="build.api" value="${module.output}/api"/>
- <property name="build.etc" value="${module.output}/etc"/>
- <property name="build.resources" value="${module.output}/resources"/>
- <property name="build.reports" value="${module.output}/reports"/>
- <property name="build.deployers" value="${module.output}/deployers"/>
-
- <!-- Install/Release structure -->
- <property name="install.id" value="${module.name}-${module.version}"/>
- <property name="release.id" value="${install.id}"/>
- <property name="install.root" value="${module.output}/${install.id}"/>
-
- <!-- The combined thirdparty classpath -->
- <path id="thirdparty.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- </path>
-
- <!-- RMIC should generate stubs compatible with Java 1.2+ -->
- <property name="rmic.stubVersion" value="1.2"/>
-
- <!-- classpath and local.classpath must have a value using with a path -->
- <property name="classpath" value=""/>
- <property name="local.classpath" value=""/>
-
- <!-- The classpath required to build classes. -->
- <path id="javac.classpath">
- <pathelement path="${classpath}"/>
- <pathelement path="${local.classpath}"/>
- <path refid="thirdparty.classpath"/>
- </path>
-
- <!-- The classpath required to build javadocs. -->
- <path id="javadoc.classpath">
- <path refid="javac.classpath"/>
- </path>
-
- <!-- Packages to include when generating api documentation -->
- <property name="javadoc.packages" value="org.jboss.*"/>
-
- </target>
-
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | different type of compile that needs to be performed, short of
- | documentation compiles.
- -->
- <target name="compile"
- depends="compile-classes, compile-etc, compile-resources"
- description="Compile all source files."/>
-
- <!-- Compile all class files -->
- <target name="compile-classes" depends="compile-classes-jdk5, compile-classes-jdk6"/>
- <target name="compile-classes-jdk5" depends="init" unless="HAVE_JDK_1.6">
- <mkdir dir="${build.classes}"/>
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- target="${javac.target}"
- source="${javac.source}"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- includes="${javac.includes}"
- excludes="${javac.excludes}"
- failonerror="${javac.fail.onerror}">
- <src path="${source.java}"/>
- <classpath refid="javac.classpath"/>
- <exclude name="org/jboss/varia/stats/*JDK6.java"/>
- <exclude name="org/jboss/tm/plugins/tyrex/*.java"/>
- <exclude name="org/jboss/jdo/castor/*.java"/>
- </javac>
- </target>
- <target name="compile-classes-jdk6" depends="init" if="HAVE_JDK_1.6">
- <mkdir dir="${build.classes}"/>
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- target="${javac.target}"
- source="${javac.source}"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- includes="${javac.includes}"
- excludes="${javac.excludes}"
- failonerror="${javac.fail.onerror}">
- <src path="${source.java}"/>
- <classpath refid="javac.classpath"/>
- <exclude name="org/jboss/varia/stats/*JDK5.java"/>
- <exclude name="org/jboss/tm/plugins/tyrex/*.java"/>
- <exclude name="org/jboss/jdo/castor/*.java"/>
- </javac>
- </target>
-
- <!-- Compile manifests -->
- <target name="compile-etc" depends="init">
- <mkdir dir="${build.etc}"/>
- <copy todir="${build.etc}" filtering="yes">
- <fileset dir="${source.etc}">
- <include name="**"/>
- </fileset>
- </copy>
- </target>
-
- <!-- Compile resource files -->
- <target name="compile-resources" depends="init">
- <mkdir dir="${build.resources}"/>
- <copy todir="${build.resources}" filtering="yes">
- <fileset dir="${source.resources}">
- <include name="**/*"/>
- <exclude name="jmx/html/images/**"/>
- </fileset>
- </copy>
- <copy todir="${build.resources}" filtering="no">
- <fileset dir="${source.resources}">
- <include name="jmx/html/images/**"/>
- </fileset>
- </copy>
- </target>
-
-
- <!-- ================================================================== -->
- <!-- Archives -->
- <!-- ================================================================== -->
-
- <!--
- | Build all jar files.
- -->
- <target name="jars" description="Builds all jar files."
- depends="_buildmagic:build-bypass-check"
- unless="build-bypass.on">
-
- <call target="compile"/>
-
- <mkdir dir="${build.lib}"/>
-
- <!-- autonumber-plugin.jar -->
- <jar jarfile="${build.lib}/autonumber-plugin.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/varia/autonumber/**"/>
- </fileset>
- </jar>
-
- <!-- counter-plugin.jar -->
- <jar jarfile="${build.lib}/counter-plugin.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/varia/counter/**"/>
- </fileset>
- </jar>
-
- <!-- deployment-service.jar/sar -->
- <jar jarfile="${build.lib}/deployment-service.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/services/deployment/**"/>
- <include name="org/jboss/varia/deployment/**"/>
- </fileset>
- </jar>
- <jar jarfile="${build.lib}/deployment-service.sar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.resources}/services/deployment">
- <include name="META-INF/**"/>
- </fileset>
- <fileset dir="${build.lib}">
- <include name="deployment-service.jar"/>
- </fileset>
- <fileset dir="${apache.collections.lib}">
- <include name="commons-collections.jar"/>
- </fileset>
- <fileset dir="${apache.velocity.lib}">
- <include name="velocity.jar"/>
- </fileset>
- </jar>
-
- <!-- scheduler-plugin.jar -->
- <jar jarfile="${build.lib}/scheduler-plugin.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/varia/scheduler/**"/>
- </fileset>
- </jar>
-
- <!-- scheduler-plugin-example.jar -->
- <jar jarfile="${build.lib}/scheduler-plugin-example.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/varia/scheduler/example/**"/>
- </fileset>
- </jar>
-
- <!-- mail-plugin.jar -->
- <jar jarfile="${build.lib}/mail-plugin.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/mail/*"/>
- </fileset>
- </jar>
-
- <!-- patched hsqldb.jar -->
- <jar jarfile="${build.lib}/hsqldb.jar"
- manifest="${build.etc}/default.mf">
- <zipfileset src="${hsqldb.hsqldb.lib}/hsqldb.jar">
- <include name="**"/>
- <exclude name="org/hsqldb/Embedded**"/>
- <exclude name="**/MANIFEST.MF"/>
- </zipfileset>
- <fileset dir="${build.classes}">
- <include name="org/hsqldb/Embedded**"/>
- </fileset>
- </jar>
-
- <!-- hsqldb-plugin.jar -->
- <jar jarfile="${build.lib}/hsqldb-plugin.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/jdbc/Hypersonic**"/>
- </fileset>
- </jar>
-
- <!-- derby-plugin.jar -->
- <jar jarfile="${build.lib}/derby-plugin.jar" manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/jdbc/Derby**"/>
- </fileset>
- </jar>
-
- <!-- properties-plugin.jar -->
- <jar jarfile="${build.lib}/properties-plugin.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/varia/property/**"/>
- </fileset>
- </jar>
-
- <!-- process-plugin.jar -->
- <jar jarfile="${build.lib}/process-plugin.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/varia/process/**"/>
- </fileset>
- </jar>
-
- <!-- foe-deployer.sar -->
- <jar jarfile="${build.lib}/foe-deployer-3.2.sar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/varia/deployment/Foe**"/>
- <include name="org/jboss/varia/deployment/convertor/**"/>
- </fileset>
- <fileset dir="${build.resources}/deployment">
- <include name="META-INF/**"/>
- <include name="resources/6.1/**"/>
- </fileset>
- <fileset dir="${build.etc}">
- <include name="foe-deployer-service.xml"/>
- </fileset>
- </jar>
-
- <!-- statscollector.jar -->
- <jar jarfile="${build.lib}/statscollector.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/varia/stats/**"/>
- </fileset>
- </jar>
-
- <!-- jmx-console.war -->
- <war warfile="${build.lib}/jmx-console.war"
- webxml="${source.resources}/jmx/jmx-console-web.xml">
- <webinf dir="${source.resources}/jmx/web-inf"/>
- <classes dir="${build.classes}">
- <include name="org/jboss/jmx/adaptor/**"/>
- <exclude name="org/jboss/jmx/adaptor/snmp/**"/>
- </classes>
- <classes dir="${source.resources}/jmx">
- <include name="*.properties"/>
- </classes>
- <fileset dir="${source.resources}/jmx/html"/>
- </war>
-
- <!-- persistent-service.sar -->
- <!-- demo service for docs/examples -->
- <jar jarfile="${build.lib}/persistent-service.sar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/jmx/examples/persistence/**"/>
- </fileset>
- <fileset dir="${build.resources}/jmx/examples/persistent-service"/>
- </jar>
-
- <!-- mbean-configurator-service.sar -->
- <!-- demo service for docs/examples -->
- <!-- shows how to set attributes on registered mbean from file -->
- <jar jarfile="${build.lib}/mbean-configurator.sar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/jmx/examples/configuration/**"/>
- </fileset>
- <fileset dir="${build.resources}/jmx/examples/mbean-configurator-service"/>
- </jar>
-
- <!-- jboss-monitoring.jar -->
- <jar jarfile="${build.lib}/jboss-monitoring.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/monitor/**"/>
- </fileset>
- </jar>
-
- <!-- http-invoker.sar + war -->
- <zip destfile="${build.lib}/http-invoker.sar">
- <zipfileset dir="${build.resources}/services/invoker/http"
- prefix="invoker.war/WEB-INF">
- <include name="jboss-web.xml" />
- <include name="web.xml" />
- </zipfileset>
- <zipfileset dir="${build.classes}" prefix="invoker.war/WEB-INF/classes">
- <include name="org/jboss/invocation/http/**"/>
- </zipfileset>
- <zipfileset dir="${build.resources}/services/invoker/http"
- prefix="META-INF">
- <include name="jboss-service.xml" />
- </zipfileset>
- </zip>
-
- <!-- httpha-invoker.sar + war -->
- <zip destfile="${build.lib}/httpha-invoker.sar">
- <zipfileset dir="${build.resources}/services/invoker/httpha"
- prefix="invoker.war/WEB-INF">
- <include name="jboss-web.xml" />
- <include name="jboss-scanning.xml" />
- <include name="web.xml" />
- </zipfileset>
- <zipfileset dir="${build.classes}" prefix="invoker.war/WEB-INF/classes">
- <include name="org/jboss/invocation/http/**"/>
- </zipfileset>
- <zipfileset dir="${build.resources}/services/invoker/httpha"
- prefix="META-INF">
- <include name="jboss-service.xml" />
- <include name="jboss-scanning.xml" />
- </zipfileset>
- </zip>
-
- <!-- Build jbossjmx-ant.jar -->
- <jar jarfile="${build.lib}/jbossjmx-ant.jar" manifest="${build.etc}/default.mf">
- <zipfileset fullpath="META-INF/MANIFEST.MF" dir="${build.etc}">
- <include name="default.mf" />
- </zipfileset>
- <fileset dir="${build.classes}">
- <include name="org/jboss/ant/**"/>
- </fileset>
- <zipfileset src="${jboss.jnpserver.lib}/jnpserver.jar">
- </zipfileset>
- <fileset dir="${jboss.server.root}/classes">
- <include name="org/jboss/jmx/adaptor/rmi/RMIAdaptor.class"/>
- <include name="org/jboss/jmx/adaptor/rmi/RMIAdaptorImpl_Stub.class"/>
- <include name="org/jboss/jmx/adaptor/rmi/RMIAdaptorService.class"/>
- <include name="org/jboss/jmx/connector/**"/>
- </fileset>
- </jar>
-
- <!-- Build netboot.war -->
- <war warfile="${build.lib}/netboot.war" webxml="${build.resources}/netboot/WEB-INF/web.xml">
- <fileset dir="${build.resources}/netboot" excludes="WEB-INF/web.xml"/>
- <classes dir="${build.classes}">
- <include name="org/jboss/netboot/**"/>
- </classes>
- </war>
-
- <!-- bsh-deployer.jar -->
-
- <mkdir dir="${build.deployers}/bsh.deployer"/>
- <mkdir dir="${build.deployers}/bsh.deployer/META-INF"/>
-
- <jar jarfile="${build.deployers}/bsh.deployer/bsh-deployer.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/varia/deployment/BeanShell**"/>
- <include name="org/jboss/varia/deployment/Script**"/>
- <include name="org/jboss/varia/deployment/Test**"/>
- <include name="org/jboss/varia/deployment/Legacy**"/>
- </fileset>
- </jar>
-
- <copy todir="${build.deployers}/bsh.deployer/META-INF">
- <fileset file="${source.resources}/beanshell/bsh-deployers-jboss-beans.xml"/>
- </copy>
-
- <!-- seam.deployer -->
-
- <mkdir dir="${build.deployers}/seam.deployer"/>
- <mkdir dir="${build.deployers}/seam.deployer/META-INF"/>
-
- <copy todir="${build.deployers}/seam.deployer/META-INF">
- <fileset dir="${source.resources}/seam">
- <include name="*.xml"/>
- </fileset>
- </copy>
-
- <copy todir="${build.deployers}/seam.deployer">
- <fileset dir="${org.jboss.seam.integration.lib}">
- <include name="jboss-seam-int-microcontainer.jar"/>
- </fileset>
- </copy>
-
- <!-- snmp-adaptor.sar containing snmp-adaptor.jar -->
- <jar jarfile="${build.lib}/snmp-adaptor.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/jmx/adaptor/snmp/**"/>
- </fileset>
- </jar>
- <jar jarfile="${build.lib}/snmp-adaptor.sar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.resources}/services/snmp/deploy"/>
- <fileset dir="${build.lib}">
- <include name="snmp-adaptor.jar"/>
- </fileset>
- </jar>
-
- <!-- Generate the (.deployer) to be used for bean deployment -->
- <jar jarfile="${build.lib}/jboss-bean-deployer.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/kernel/deployment/**"/>
- </fileset>
- </jar>
- <mkdir dir="${build.lib}/kernel/jboss-bean.deployer"/>
- <copy todir="${build.lib}/kernel/jboss-bean.deployer" filtering="no">
- <fileset file="${build.lib}/jboss-bean-deployer.jar"/>
- <fileset dir="${jboss.microcontainer.lib}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${jboss.microcontainer.lib}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${jboss.microcontainer.lib}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${build.resources}/kernel">
- <include name="**/*.xml"/>
- </fileset>
- </copy>
-
- <!-- logging-monitor.jar -->
- <jar jarfile="${build.lib}/logging-monitor.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/services/loggingmonitor/**"/>
- </fileset>
- </jar>
-
- <!-- xmlentitymgr.jar -->
- <jar jarfile="${build.lib}/xmlentitymgr.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/services/xml/**"/>
- </fileset>
- </jar>
-
- <!--jboss-samlsso jar-->
- <jar jarfile="${build.lib}/jboss-samlsso.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/security/identity/sso/**"/>
- </fileset>
- </jar>
-
- <!-- SRP jars -->
- <jar jarfile="${build.lib}/jboss-srp.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/security/srp/**"/>
- </fileset>
- </jar>
- <!-- Build jboss-srp-client.jar -->
- <jar jarfile="${build.lib}/jboss-srp-client.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/security/srp/PkgCategory.class"/>
- <include name="org/jboss/security/srp/TracePriority.class"/>
- <include name="org/jboss/security/srp/SRPClientSession.class"/>
- <include name="org/jboss/security/srp/SRPServerInterface*.class"/>
- <include name="org/jboss/security/srp/SRPServerProxy.class"/>
- <include name="org/jboss/security/srp/SRPParameters.class"/>
- <include name="org/jboss/security/srp/SRPPermission.class"/>
- <include name="org/jboss/security/srp/SRPConf*.class"/>
- <include name="org/jboss/security/srp/SRPRemoteServer_Stub.class"/>
- <include name="org/jboss/security/srp/SRPRemoteServerInterface.class"/>
- <include name="org/jboss/security/srp/SRPVerifierStore.class"/>
- <include name="org/jboss/security/srp/SRPVerifierStore$*.class"/>
- <include name="org/jboss/security/srp/jaas/SRPLoginModule.class"/>
- <include name="org/jboss/security/srp/jaas/SRPPrincipal.class"/>
- </fileset>
- </jar>
-
- <!-- Build threaddump.war -->
- <war warfile="${build.lib}/threaddump.war" webxml="${build.resources}/varia/threaddump/web.xml">
- <fileset dir="${build.resources}/varia/threaddump" excludes="web.xml"/>
- <classes dir="${build.classes}">
- <include name="org/jboss/varia/threaddump/**"/>
- </classes>
- </war>
-
- <!-- Update the build marker to allow bypassing -->
- <touch file="${build-bypass.marker}"/>
-
- </target>
-
- <target name="validateHeaders" depends="compile"
- description="Validate the source tree headers">
- <java classname="org.jboss.tools.license.ValidateLicenseHeaders"
- fork="true">
- <arg value="-addheader"/>
- <arg value="${project.root}"/>
- <classpath>
- <pathelement location="${build.classes}" />
- </classpath>
- </java>
- </target>
-
- <!-- Use ant -Djboss.dist=/release/jboss-x.y.z to create a serialuid.ser for the x.y.z dist -->
- <target name="buildSerialVersionUIDDB" depends="compile"
- description="Create a serialVersionUID db for a jboss.dist">
- <fail unless="jboss.dist" message="The jboss.dist variable must be defined" />
- <java classname="org.jboss.tools.SerialVersionUID"
- fork="true">
- <jvmarg value="-XX:MaxPermSize=256m"/>
- <jvmarg value="-Xms256m"/>
- <jvmarg value="-Xmx256m"/>
- <arg value="${jboss.dist}" />
- <classpath>
- <pathelement location="${build.classes}" />
- </classpath>
- </java>
- </target>
-
- <!-- ================================================================== -->
- <!-- Install & Release -->
- <!-- ================================================================== -->
-
- <target name="install"
- description="Install the structure for a release."
- depends="all, _buildmagic:install:default"/>
-
- <target name="release" depends="install"/>
-
- <target name="release-zip"
- description="Builds a ZIP distribution."
- depends="release, _buildmagic:release:zip"/>
-
- <target name="release-tar"
- description="Builds a TAR distribution."
- depends="release, _buildmagic:release:tar"/>
-
- <target name="release-tgz"
- description="Builds a TAR-GZ distribution."
- depends="release, _buildmagic:release:tgz"/>
-
- <target name="release-all"
- description="Builds a distribution for each archive type."
- depends="release-zip, release-tgz"/>
-
-
- <!-- ================================================================== -->
- <!-- Cleaning -->
- <!-- ================================================================== -->
-
- <!-- Clean up all build output -->
- <target name="clean"
- description="Cleans up most generated files."
- depends="_buildmagic:clean">
- </target>
-
- <!-- Clean up all generated files -->
- <target name="clobber"
- description="Cleans up all generated files."
- depends="_buildmagic:clobber, clean">
- </target>
-
-
- <!-- ================================================================== -->
- <!-- Misc. -->
- <!-- ================================================================== -->
-
- <target name="main"
- description="Executes the default target (most)."
- depends="most"/>
-
- <target name="all"
- description="Builds everything."
- depends="jars, docs"/>
-
- <target name="most"
- description="Builds almost everything."
- depends="jars"/>
-
- <target name="help"
- description="Show this help message."
- depends="_buildmagic:help:standard"/>
-
-</project>
Modified: branches/dml-log-service-integration/varia/pom.xml
===================================================================
--- branches/dml-log-service-integration/varia/pom.xml 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/varia/pom.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -22,7 +22,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
<executions>
<execution>
<id>assembly</id>
@@ -107,67 +106,54 @@
<include name="jmx/html/images/**"/>
</fileset>
</copy>
+
+ <!-- build deployers -->
+
+ <property name="build.deployers" location="target/deployers"/>
+ <property name="source.resources" location="src/resources"/>
- <!-- Copy jars -->
- <!--<property name="output.lib" location="${basedir}/output/lib"/>
- <mkdir dir="${output.lib}"/>
- <copy file="target/${artifactId}-${version}-autonumber-plugin.jar"
- tofile="${output.lib}/autonumber-plugin.jar"/>
- <copy file="target/${artifactId}-${version}-counter-plugin.jar"
- tofile="${output.lib}/counter-plugin.jar"/>
- <copy file="target/${artifactId}-${version}-deployment-service.jar"
- tofile="${output.lib}/deployment-service.jar"/>
- <copy file="target/${artifactId}-${version}-derby-plugin.jar"
- tofile="${output.lib}/derby-plugin.jar"/>
- <copy file="target/${artifactId}-${version}-hsqldb.jar"
- tofile="${output.lib}/hsqldb.jar"/>
- <copy file="target/${artifactId}-${version}-hsqldb-plugin.jar"
- tofile="${output.lib}/hsqldb-plugin.jar"/>
- <copy file="target/${artifactId}-${version}-jboss-bean-deployer.jar"
- tofile="${output.lib}/jboss-bean-deployer.jar"/>
- <copy file="target/${artifactId}-${version}-jboss-bindingservice.jar"
- tofile="${output.lib}/jboss-bindingservice.jar"/>
- <copy file="target/${artifactId}-${version}-jbossjmx-ant.jar"
- tofile="${output.lib}/jbossjmx-ant.jar"/>
- <copy file="target/${artifactId}-${version}-jboss-monitoring.jar"
- tofile="${output.lib}/jboss-monitoring.jar"/>
- <copy file="target/${artifactId}-${version}-jboss-samlsso.jar"
- tofile="${output.lib}/jboss-samlsso.jar"/>
- <copy file="target/${artifactId}-${version}-jboss-srp.jar"
- tofile="${output.lib}/jboss-srp.jar"/>
- <copy file="target/${artifactId}-${version}-jboss-srp-client.jar"
- tofile="${output.lib}/jboss-srp-client.jar"/>
- <copy file="target/${artifactId}-${version}-logging-monitor.jar"
- tofile="${output.lib}/logging-monitor.jar"/>
- <copy file="target/${artifactId}-${version}-mail-plugin.jar"
- tofile="${output.lib}/mail-plugin.jar"/>
- <copy file="target/${artifactId}-${version}-process-plugin.jar"
- tofile="${output.lib}/process-plugin.jar"/>
- <copy file="target/${artifactId}-${version}-properties-plugin.jar"
- tofile="${output.lib}/properties-plugin.jar"/>
- <copy file="target/${artifactId}-${version}-scheduler-plugin.jar"
- tofile="${output.lib}/scheduler-plugin.jar"/>
- <copy file="target/${artifactId}-${version}-scheduler-plugin-example.jar"
- tofile="${output.lib}/scheduler-plugin-example.jar"/>
- <copy file="target/${artifactId}-${version}-snmp-adaptor.jar"
- tofile="${output.lib}/snmp-adaptor.jar"/>
- <copy file="target/${artifactId}-${version}-statscollector.jar"
- tofile="${output.lib}/statscollector.jar"/>
- <copy file="target/${artifactId}-${version}-xmlentitymgr.jar"
- tofile="${output.lib}/xmlentitymgr.jar"/>
- -->
+ <mkdir dir="${build.deployers}/bsh.deployer"/>
+ <mkdir dir="${build.deployers}/bsh.deployer/META-INF"/>
+
+ <jar jarfile="${build.deployers}/bsh.deployer/bsh-deployer.jar">
+ <fileset dir="${project.build.outputDirectory}">
+ <include name="org/jboss/varia/deployment/BeanShell**"/>
+ <include name="org/jboss/varia/deployment/Script**"/>
+ <include name="org/jboss/varia/deployment/Test**"/>
+ <include name="org/jboss/varia/deployment/Legacy**"/>
+ </fileset>
+ </jar>
+
+ <copy todir="${build.deployers}/bsh.deployer/META-INF">
+ <fileset file="${source.resources}/beanshell/bsh-deployers-jboss-beans.xml"/>
+ </copy>
+
+ <!-- seam.deployer -->
+ <mkdir dir="${build.deployers}/seam.deployer"/>
+ <mkdir dir="${build.deployers}/seam.deployer/META-INF"/>
+
+ <copy todir="${build.deployers}/seam.deployer/META-INF">
+ <fileset dir="${source.resources}/seam">
+ <include name="*.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${build.deployers}/seam.deployer">
+ <fileset file="${maven.dependency.org.jboss.seam.integration.jboss-seam-int-microcontainer.jar.path}"/>
+ </copy>
+
+ <!-- jboss-bean.deployer -->
+ <mkdir dir="target/kernel/jboss-bean.deployer"/>
+ <copy todir="target/kernel/jboss-bean.deployer" filtering="no">
+ <fileset file="target/jboss-bean-deployer.jar"/>
+ <fileset file="${maven.dependency.org.jboss.microcontainer.jboss-aop-mc-int.jar.path}"/>
+ <fileset file="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
+ <fileset file="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
+ <fileset dir="target/resources/kernel">
+ <include name="**/*.xml"/>
+ </fileset>
+ </copy>
- <!-- copy wars -->
- <!--<copy file="target/${artifactId}-${version}-jmx-console.war"
- tofile="${output.lib}/jmx-console.war"/>
- <copy file="target/${artifactId}-${version}-netboot.war"
- tofile="${output.lib}/netboot.war"/>
- <copy file="target/${artifactId}-${version}-threaddump.war"
- tofile="${output.lib}/threaddump.war"/>-->
-
- <!-- build sars and deployers -->
- <ant antfile="build-sars.xml" target="build-sars"/>
-
</tasks>
</configuration>
</execution>
@@ -370,6 +356,11 @@
<artifactId>hsqldb</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.seam.integration</groupId>
+ <artifactId>jboss-seam-int-microcontainer</artifactId>
+ </dependency>
+
</dependencies>
<profiles>
Modified: branches/dml-log-service-integration/varia/src/assembly/deployment-service-sar.xml
===================================================================
--- branches/dml-log-service-integration/varia/src/assembly/deployment-service-sar.xml 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/varia/src/assembly/deployment-service-sar.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -22,7 +22,7 @@
</fileSets>
<dependencySets>
<dependencySet>
- <outputFileNameMapping>${artifactId}.jar</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}.jar</outputFileNameMapping>
<includes>
<include>commons-collections:commons-collections</include>
<include>apache-velocity:velocity</include>
Modified: branches/dml-log-service-integration/varia/src/assembly/http-invoker-sar.xml
===================================================================
--- branches/dml-log-service-integration/varia/src/assembly/http-invoker-sar.xml 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/varia/src/assembly/http-invoker-sar.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -17,7 +17,7 @@
<outputDirectory>/invoker.war/WEB-INF</outputDirectory>
<includes>
<include>jboss-web.xml</include>
- <include>-web.xml</include>
+ <include>web.xml</include>
</includes>
</fileSet>
<fileSet>
Deleted: branches/dml-log-service-integration/varia/src/assembly/httpa-invoker-sar.xml
===================================================================
--- branches/dml-log-service-integration/varia/src/assembly/httpa-invoker-sar.xml 2009-06-29 14:14:27 UTC (rev 90674)
+++ branches/dml-log-service-integration/varia/src/assembly/httpa-invoker-sar.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -1,31 +0,0 @@
-<assembly>
- <id>httpa-invoker-sar</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/invoker.war/WEB-INF/classes</outputDirectory>
- <includes>
- <include>org/jboss/invocation/http/**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/resources/services/invoker/httpa</directory>
- <outputDirectory>/invoker.war/WEB-INF</outputDirectory>
- <includes>
- <include>jboss-web.xml</include>
- <include>-web.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/resources/services/invoker/httpa</directory>
- <outputDirectory>/META-INF</outputDirectory>
- <includes>
- <include>jboss-service.xml</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Copied: branches/dml-log-service-integration/varia/src/assembly/httpha-invoker-sar.xml (from rev 90672, trunk/varia/src/assembly/httpha-invoker-sar.xml)
===================================================================
--- branches/dml-log-service-integration/varia/src/assembly/httpha-invoker-sar.xml (rev 0)
+++ branches/dml-log-service-integration/varia/src/assembly/httpha-invoker-sar.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -0,0 +1,33 @@
+<assembly>
+ <id>httpha-invoker-sar</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/invoker.war/WEB-INF/classes</outputDirectory>
+ <includes>
+ <include>org/jboss/invocation/http/**</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/resources/services/invoker/httpha</directory>
+ <outputDirectory>/invoker.war/WEB-INF</outputDirectory>
+ <includes>
+ <include>jboss-web.xml</include>
+ <include>jboss-scanning.xml</include>
+ <include>web.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/resources/services/invoker/httpha</directory>
+ <outputDirectory>/META-INF</outputDirectory>
+ <includes>
+ <include>jboss-service.xml</include>
+ <include>jboss-scanning.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Copied: branches/dml-log-service-integration/varia/src/assembly/snmp-adaptor-sar.xml (from rev 90672, trunk/varia/src/assembly/snmp-adaptor-sar.xml)
===================================================================
--- branches/dml-log-service-integration/varia/src/assembly/snmp-adaptor-sar.xml (rev 0)
+++ branches/dml-log-service-integration/varia/src/assembly/snmp-adaptor-sar.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -0,0 +1,20 @@
+<assembly>
+ <id>snmp-adaptor-sar</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>jboss-as-varia-snmp-adaptor.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/resources/services/snmp/deploy</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Copied: branches/dml-log-service-integration/varia/src/resources/jmx/web-inf/jboss-scanning.xml (from rev 90672, trunk/varia/src/resources/jmx/web-inf/jboss-scanning.xml)
===================================================================
--- branches/dml-log-service-integration/varia/src/resources/jmx/web-inf/jboss-scanning.xml (rev 0)
+++ branches/dml-log-service-integration/varia/src/resources/jmx/web-inf/jboss-scanning.xml 2009-06-29 14:27:52 UTC (rev 90675)
@@ -0,0 +1,3 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+<!-- Purpose: Disable scanning for annotations in contained deployment. -->
+</scanning>
More information about the jboss-cvs-commits
mailing list