[jboss-cvs] JBossAS SVN: r106724 - in projects/jboss-jca/trunk: api and 43 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 14 16:20:59 EDT 2010
Author: jesper.pedersen
Date: 2010-07-14 16:20:57 -0400 (Wed, 14 Jul 2010)
New Revision: 106724
Removed:
projects/jboss-jca/trunk/api/src/main/resources/manifest.mf
projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator-manifest.mf
projects/jboss-jca/trunk/common/src/main/resources/common-manifest.mf
projects/jboss-jca/trunk/core/src/main/resources/api-manifest.mf
projects/jboss-jca/trunk/core/src/main/resources/impl-manifest.mf
projects/jboss-jca/trunk/core/src/main/resources/spi-manifest.mf
projects/jboss-jca/trunk/deployers/src/main/resources/fungal-ra-manifest.mf
projects/jboss-jca/trunk/deployers/src/main/resources/jca-deployers-jboss-beans.xml
projects/jboss-jca/trunk/deployers/src/main/resources/main-manifest.mf
projects/jboss-jca/trunk/deployers/src/main/resources/rar-manifest.mf
projects/jboss-jca/trunk/embedded/src/main/resources/arquillian-manifest.mf
projects/jboss-jca/trunk/embedded/src/main/resources/embedded-manifest.mf
projects/jboss-jca/trunk/sjc/src/main/resources/sjc-manifest.mf
projects/jboss-jca/trunk/standalone/src/main/resources/standalone-manifest.mf
projects/jboss-jca/trunk/validator/src/main/resources/validator-ant-manifest.mf
projects/jboss-jca/trunk/validator/src/main/resources/validator-cli-manifest.mf
projects/jboss-jca/trunk/validator/src/main/resources/validator-manifest.mf
projects/jboss-jca/trunk/web/src/main/resources/console-manifest.mf
projects/jboss-jca/trunk/web/src/main/resources/web-manifest.mf
Modified:
projects/jboss-jca/trunk/api/build.xml
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/codegenerator/build.xml
projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.bat
projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.sh
projects/jboss-jca/trunk/codegenerator/src/main/resources/logging.properties.template
projects/jboss-jca/trunk/common/build.xml
projects/jboss-jca/trunk/core/build.xml
projects/jboss-jca/trunk/core/src/test/resources/connectionmanager-jboss-beans.xml
projects/jboss-jca/trunk/core/src/test/resources/logging.properties
projects/jboss-jca/trunk/core/src/test/resources/mdr-jboss-beans.xml
projects/jboss-jca/trunk/core/src/test/resources/naming-jboss-beans.xml
projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase-jboss-beans.xml
projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase-jboss-beans.xml
projects/jboss-jca/trunk/core/src/test/resources/rejecting-workmanager-jboss-beans.xml
projects/jboss-jca/trunk/core/src/test/resources/transaction-jboss-beans.xml
projects/jboss-jca/trunk/core/src/test/resources/workmanager-jboss-beans.xml
projects/jboss-jca/trunk/deployers/build.xml
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
projects/jboss-jca/trunk/deployers/src/test/resources/logging.properties
projects/jboss-jca/trunk/doc/developerguide/build.xml
projects/jboss-jca/trunk/doc/developerguide/en/master.xml
projects/jboss-jca/trunk/doc/developerguide/en/modules/building.xml
projects/jboss-jca/trunk/doc/developerguide/en/modules/metadata.xml
projects/jboss-jca/trunk/doc/developerguide/en/modules/standalone.xml
projects/jboss-jca/trunk/doc/developerguide/en/modules/testing.xml
projects/jboss-jca/trunk/doc/userguide/build.xml
projects/jboss-jca/trunk/doc/userguide/en/master.xml
projects/jboss-jca/trunk/doc/userguide/en/modules/about.xml
projects/jboss-jca/trunk/doc/userguide/en/modules/codegenerator.xml
projects/jboss-jca/trunk/doc/userguide/en/modules/community.xml
projects/jboss-jca/trunk/doc/userguide/en/modules/configuration.xml
projects/jboss-jca/trunk/doc/userguide/en/modules/deployment.xml
projects/jboss-jca/trunk/doc/userguide/en/modules/download.xml
projects/jboss-jca/trunk/doc/userguide/en/modules/embedded.xml
projects/jboss-jca/trunk/doc/userguide/en/modules/installation.xml
projects/jboss-jca/trunk/doc/userguide/en/modules/running.xml
projects/jboss-jca/trunk/doc/userguide/en/modules/validator.xml
projects/jboss-jca/trunk/embedded/build.xml
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java
projects/jboss-jca/trunk/embedded/src/main/resources/naming.xml
projects/jboss-jca/trunk/embedded/src/main/resources/transaction.xml
projects/jboss-jca/trunk/embedded/src/test/resources/logging.properties
projects/jboss-jca/trunk/ivy.xml
projects/jboss-jca/trunk/sjc/build.xml
projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/Main.java
projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml
projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/naming.xml
projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/transaction.xml
projects/jboss-jca/trunk/sjc/src/main/resources/logging.properties
projects/jboss-jca/trunk/sjc/src/main/resources/run.bat
projects/jboss-jca/trunk/sjc/src/main/resources/run.sh
projects/jboss-jca/trunk/sjc/src/main/resources/system/web.xml
projects/jboss-jca/trunk/standalone/build.xml
projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/Main.java
projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/jca.xml
projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/naming.xml
projects/jboss-jca/trunk/standalone/src/main/resources/logging.properties
projects/jboss-jca/trunk/standalone/src/main/resources/run.bat
projects/jboss-jca/trunk/standalone/src/main/resources/run.sh
projects/jboss-jca/trunk/validator/build.xml
projects/jboss-jca/trunk/validator/src/main/resources/validator.bat
projects/jboss-jca/trunk/validator/src/main/resources/validator.sh
projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/ao/AOTestCase.java
projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/as/ASTestCase.java
projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/mcf/MCFTestCase.java
projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/ra/RATestCase.java
projects/jboss-jca/trunk/validator/src/test/resources/logging.properties
projects/jboss-jca/trunk/web/build.xml
projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployer.java
projects/jboss-jca/trunk/web/src/main/resources/console/WEB-INF/web.xml
projects/jboss-jca/trunk/web/src/main/resources/web.xml
Log:
[JBJCA-382] Rebrand project as IronJacamar
Modified: projects/jboss-jca/trunk/api/build.xml
===================================================================
--- projects/jboss-jca/trunk/api/build.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/api/build.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project name="jboss-jca-spec-api"
+<project name="ironjacamar-spec-api"
default="compile"
xmlns:ivy="antlib:org.apache.ivy.ant">
@@ -47,10 +47,17 @@
Target: jars
================================= -->
<target name="jars" depends="compile">
- <jar destfile="${target.dir}/jboss-jca-spec-api.jar"
- manifest="src/main/resources/manifest.mf"
+ <jar destfile="${target.dir}/${name}-spec-api.jar"
basedir="${build.api.dir}"
- excludes="**/*.java"/>
+ excludes="**/*.java">
+ <manifest>
+ <attribute name="Implementation-Title" value="The Java EE Connector Architecture 1.6 API"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ </manifest>
+ </jar>
+
</target>
<!-- =================================
Deleted: projects/jboss-jca/trunk/api/src/main/resources/manifest.mf
===================================================================
--- projects/jboss-jca/trunk/api/src/main/resources/manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/api/src/main/resources/manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,6 +0,0 @@
-Specification-Title: Java Connector Architecture API
-Specification-Version: 1.6
-Specification-Vendor: JCP / JSR-322
-Implementation-Title: JBoss JCA Javax Resource API
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/build.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project name="jboss-jca"
+<project name="ironjacamar"
default="jars"
basedir="."
xmlns:ivy="antlib:org.apache.ivy.ant">
@@ -30,7 +30,7 @@
<!-- =================================
Project
================================= -->
- <property name="name" value="jboss-jca"/>
+ <property name="name" value="ironjacamar"/>
<property name="major" value="1"/>
<property name="minor" value="0"/>
<property name="patch" value="0"/>
@@ -242,7 +242,7 @@
Target: init
================================= -->
<target name="init">
- <fail message="JBoss JCA requires JDK6+" unless="HAVE_JDK_1.6"/>
+ <fail message="IronJacamar requires JDK6+" unless="HAVE_JDK_1.6"/>
<ivy:settings file="${basedir}/ivy.settings.xml"/>
@@ -453,31 +453,26 @@
<fileset dir="${lib.dir}/sjc">
<include name="*.jar"/>
</fileset>
- <fileset dir="${lib.dir}/standalone">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${lib.dir}/test">
<include name="*.jar"/>
</fileset>
</auxClasspath>
- <class location="${target.dir}/jboss-jca-codegenerator.jar" />
- <class location="${target.dir}/jboss-jca-common.jar" />
- <class location="${target.dir}/jboss-jca-core-api.jar" />
- <class location="${target.dir}/jboss-jca-core-impl.jar" />
- <class location="${target.dir}/jboss-jca-core-spi.jar" />
- <class location="${target.dir}/jboss-jca-deployers-fungal.jar" />
- <class location="${target.dir}/jboss-jca-deployers-main.jar" />
- <class location="${target.dir}/jboss-jca-deployers-rar.jar" />
- <class location="${target.dir}/jboss-jca-embedded.jar" />
- <class location="${target.dir}/jboss-jca-embedded-arquillian.jar" />
- <class location="${target.dir}/jboss-jca-sjc.jar" />
- <class location="${target.dir}/jboss-jca-spec-api.jar" />
- <class location="${target.dir}/jboss-jca-standalone.jar" />
- <class location="${target.dir}/jboss-jca-validator.jar" />
- <class location="${target.dir}/jboss-jca-validator-ant.jar" />
- <class location="${target.dir}/jboss-jca-validator-cli.jar" />
- <class location="${target.dir}/jboss-jca-web.jar" />
- <class location="${target.dir}/jboss-jca-web-console.jar" />
+ <class location="${target.dir}/${name}-codegenerator.jar" />
+ <class location="${target.dir}/${name}-common.jar" />
+ <class location="${target.dir}/${name}-core-api.jar" />
+ <class location="${target.dir}/${name}-core-impl.jar" />
+ <class location="${target.dir}/${name}-core-spi.jar" />
+ <class location="${target.dir}/${name}-deployers-fungal.jar" />
+ <class location="${target.dir}/${name}-embedded.jar" />
+ <class location="${target.dir}/${name}-embedded-arquillian.jar" />
+ <class location="${target.dir}/${name}-sjc.jar" />
+ <class location="${target.dir}/${name}-spec-api.jar" />
+ <class location="${target.dir}/${name}-standalone.jar" />
+ <class location="${target.dir}/${name}-validator.jar" />
+ <class location="${target.dir}/${name}-validator-ant.jar" />
+ <class location="${target.dir}/${name}-validator-cli.jar" />
+ <class location="${target.dir}/${name}-web.jar" />
+ <class location="${target.dir}/${name}-web-console.jar" />
</findbugs>
<findbugs home="${basedir}/tools/findbugs/lib/"
@@ -498,31 +493,26 @@
<fileset dir="${lib.dir}/sjc">
<include name="*.jar"/>
</fileset>
- <fileset dir="${lib.dir}/standalone">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${lib.dir}/test">
<include name="*.jar"/>
</fileset>
</auxClasspath>
- <class location="${target.dir}/jboss-jca-codegenerator.jar" />
- <class location="${target.dir}/jboss-jca-common.jar" />
- <class location="${target.dir}/jboss-jca-core-api.jar" />
- <class location="${target.dir}/jboss-jca-core-impl.jar" />
- <class location="${target.dir}/jboss-jca-core-spi.jar" />
- <class location="${target.dir}/jboss-jca-deployers-fungal.jar" />
- <class location="${target.dir}/jboss-jca-deployers-main.jar" />
- <class location="${target.dir}/jboss-jca-deployers-rar.jar" />
- <class location="${target.dir}/jboss-jca-embedded.jar" />
- <class location="${target.dir}/jboss-jca-embedded-arquillian.jar" />
- <class location="${target.dir}/jboss-jca-sjc.jar" />
- <class location="${target.dir}/jboss-jca-spec-api.jar" />
- <class location="${target.dir}/jboss-jca-standalone.jar" />
- <class location="${target.dir}/jboss-jca-validator.jar" />
- <class location="${target.dir}/jboss-jca-validator-ant.jar" />
- <class location="${target.dir}/jboss-jca-validator-cli.jar" />
- <class location="${target.dir}/jboss-jca-web.jar" />
- <class location="${target.dir}/jboss-jca-web-console.jar" />
+ <class location="${target.dir}/${name}-codegenerator.jar" />
+ <class location="${target.dir}/${name}-common.jar" />
+ <class location="${target.dir}/${name}-core-api.jar" />
+ <class location="${target.dir}/${name}-core-impl.jar" />
+ <class location="${target.dir}/${name}-core-spi.jar" />
+ <class location="${target.dir}/${name}-deployers-fungal.jar" />
+ <class location="${target.dir}/${name}-embedded.jar" />
+ <class location="${target.dir}/${name}-embedded-arquillian.jar" />
+ <class location="${target.dir}/${name}-sjc.jar" />
+ <class location="${target.dir}/${name}-spec-api.jar" />
+ <class location="${target.dir}/${name}-standalone.jar" />
+ <class location="${target.dir}/${name}-validator.jar" />
+ <class location="${target.dir}/${name}-validator-ant.jar" />
+ <class location="${target.dir}/${name}-validator-cli.jar" />
+ <class location="${target.dir}/${name}-web.jar" />
+ <class location="${target.dir}/${name}-web-console.jar" />
</findbugs>
</target>
@@ -555,8 +545,8 @@
<copy todir="${build.dir}/instrumented">
<fileset dir="${target.dir}">
- <include name="jboss-jca-core-api.jar"/>
- <include name="jboss-jca-core-spi.jar"/>
+ <include name="${name}-core-api.jar"/>
+ <include name="${name}-core-spi.jar"/>
</fileset>
</copy>
Modified: projects/jboss-jca/trunk/codegenerator/build.xml
===================================================================
--- projects/jboss-jca/trunk/codegenerator/build.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/codegenerator/build.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project name="jboss-jca-codegenerator"
+<project name="ironjacamar-codegenerator"
default="compile"
xmlns:ivy="antlib:org.apache.ivy.ant">
@@ -64,20 +64,16 @@
includes="**/*.template **/*.properties"/>
</copy>
- <jar destfile="${target.dir}/jboss-jca-codegenerator.jar"
- manifest="src/main/resources/codegenerator-manifest.mf"
- basedir="${build.codegenerator.dir}/jars/codegenerator"/>
-<!--
- <jar destfile="${target.dir}/jboss-jca-codegenerator-cli.jar"
- manifest="src/main/resources/codegenerator-cli-manifest.mf"
- basedir="${build.codegenerator.dir}/jars/codegenerator"
- includes="**/Main*.class"/>
-
- <jar destfile="${target.dir}/jboss-jca-codegenerator-ant.jar"
- manifest="src/main/resources/codegenerator-ant-manifest.mf"
- basedir="${build.codegenerator.dir}/jars/codegenerator"
- includes="**/ant/**"/>
--->
+ <jar destfile="${target.dir}/${name}-codegenerator.jar"
+ basedir="${build.codegenerator.dir}/jars/codegenerator">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Common"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ <attribute name="Main-Class" value="org.jboss.jca.codegenerator.Main"/>
+ </manifest>
+ </jar>
</target>
<!-- =================================
@@ -92,8 +88,8 @@
docletpathref="standalone.lib.path.id"
author="true"
version="true"
- windowtitle="JBoss JCA codegenerator"
- doctitle="JBoss JCA codegenerator"
+ windowtitle="IronJacamar Code Generator"
+ doctitle="IronJacamar Code Generator"
use="true"
additionalparam="-author -version"
classpath="${build.codegenerator.dir}/impl"
Deleted: projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator-manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator-manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,5 +0,0 @@
-Implementation-Title: JBoss JCA Codegenerator
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
-Implementation-Version: 0.1
-Main-Class: org.jboss.jca.codegenerator.Main
\ No newline at end of file
Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.bat
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.bat 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.bat 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1 +1 @@
-java -jar jboss-jca-codegenerator.jar %*
\ No newline at end of file
+java -jar ironjacamar-codegenerator.jar %*
\ No newline at end of file
Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.sh
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.sh 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.sh 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,2 +1,2 @@
#!/bin/sh
-java -jar jboss-jca-codegenerator.jar $*
\ No newline at end of file
+java -jar ironjacamar-codegenerator.jar $*
\ No newline at end of file
Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/logging.properties.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/logging.properties.template 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/logging.properties.template 2010-07-14 20:20:57 UTC (rev 106724)
@@ -3,7 +3,7 @@
loggers=org.jboss.jca,org.jboss,org.jnp,com.arjuna
# Root logger level
-logger.level=${jboss.jca.log.level:INFO}
+logger.level=${iron.jacamar.log.level:INFO}
logger.handlers=CONSOLE, FILE
# org.jboss.jca
@@ -21,13 +21,13 @@
# Console handler configuration
handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.jca.log.console.level:INFO}
+handler.CONSOLE.level=${iron.jacamar.log.console.level:INFO}
handler.CONSOLE.autoFlush=true
handler.CONSOLE.formatter=PATTERN
# File handler configuration
handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=${jboss.jca.log.file.level:DEBUG}
+handler.FILE.level=${iron.jacamar.log.file.level:DEBUG}
handler.FILE.properties=autoFlush,fileName
handler.FILE.autoFlush=true
handler.FILE.fileName=${test.dir}/deployers/test.log
Modified: projects/jboss-jca/trunk/common/build.xml
===================================================================
--- projects/jboss-jca/trunk/common/build.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/common/build.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project name="jboss-common"
+<project name="ironjacamar-common"
default="compile"
xmlns:ivy="antlib:org.apache.ivy.ant">
@@ -47,9 +47,15 @@
Target: jars
================================= -->
<target name="jars" depends="compile">
- <jar destfile="${target.dir}/jboss-jca-common.jar"
- manifest="src/main/resources/common-manifest.mf"
- basedir="${build.common.dir}"/>
+ <jar destfile="${target.dir}/${name}-common.jar"
+ basedir="${build.common.dir}">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Common"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ </manifest>
+ </jar>
</target>
<!-- =================================
@@ -64,8 +70,8 @@
docletpathref="sjc.lib.path.id"
author="true"
version="true"
- windowtitle="JBoss JCA Common"
- doctitle="JBoss JCA Common"
+ windowtitle="IronJacamar Common"
+ doctitle="IronJacamar Common"
use="true"
additionalparam="-author -version"
classpath="${build.common.dir}"
Deleted: projects/jboss-jca/trunk/common/src/main/resources/common-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/common/src/main/resources/common-manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/common/src/main/resources/common-manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,4 +0,0 @@
-Implementation-Title: JBoss JCA Common
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
-Implementation-Version: 0.1
Modified: projects/jboss-jca/trunk/core/build.xml
===================================================================
--- projects/jboss-jca/trunk/core/build.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/core/build.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project name="jboss-jca-core"
+<project name="ironjacamar-core"
default="compile"
xmlns:ivy="antlib:org.apache.ivy.ant">
@@ -49,20 +49,38 @@
Target: jars
================================= -->
<target name="jars" depends="compile">
- <jar destfile="${target.dir}/jboss-jca-core-api.jar"
- manifest="src/main/resources/api-manifest.mf"
+ <jar destfile="${target.dir}/${name}-core-api.jar"
basedir="${build.core.dir}/impl"
- includes="**/core/api/**"/>
+ includes="**/core/api/**">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Core API"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ </manifest>
+ </jar>
- <jar destfile="${target.dir}/jboss-jca-core-spi.jar"
- manifest="src/main/resources/spi-manifest.mf"
+ <jar destfile="${target.dir}/${name}-core-spi.jar"
basedir="${build.core.dir}/impl"
- includes="**/core/spi/**"/>
+ includes="**/core/spi/**">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Core SPI"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ </manifest>
+ </jar>
- <jar destfile="${target.dir}/jboss-jca-core-impl.jar"
- manifest="src/main/resources/impl-manifest.mf"
+ <jar destfile="${target.dir}/${name}-core-impl.jar"
basedir="${build.core.dir}/impl"
- excludes="**/*.java, **/core/api/**, **/core/spi/**"/>
+ excludes="**/*.java, **/core/api/**, **/core/spi/**">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Core Implementation"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ </manifest>
+ </jar>
</target>
<!-- =================================
@@ -77,8 +95,8 @@
docletpathref="sjc.lib.path.id"
author="true"
version="true"
- windowtitle="JBoss JCA Core"
- doctitle="JBoss JCA Core"
+ windowtitle="IronJacamar Core"
+ doctitle="IronJacamar Core"
use="true"
additionalparam="-author -version"
classpath="${build.core.dir}/impl"
Deleted: projects/jboss-jca/trunk/core/src/main/resources/api-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/core/src/main/resources/api-manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/core/src/main/resources/api-manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,4 +0,0 @@
-Implementation-Title: JBoss JCA Core API
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
-Implementation-Version: 0.1
Deleted: projects/jboss-jca/trunk/core/src/main/resources/impl-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/core/src/main/resources/impl-manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/core/src/main/resources/impl-manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,4 +0,0 @@
-Implementation-Title: JBoss JCA Core Implementation
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
-Implementation-Version: 0.1
Deleted: projects/jboss-jca/trunk/core/src/main/resources/spi-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/core/src/main/resources/spi-manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/core/src/main/resources/spi-manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,4 +0,0 @@
-Implementation-Title: JBoss JCA Core SPI
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
-Implementation-Version: 0.1
Modified: projects/jboss-jca/trunk/core/src/test/resources/connectionmanager-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/connectionmanager-jboss-beans.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/core/src/test/resources/connectionmanager-jboss-beans.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- JBoss JCA
--->
<deployment>
<bean name="ConnectionManagerTx"
Modified: projects/jboss-jca/trunk/core/src/test/resources/logging.properties
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/logging.properties 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/core/src/test/resources/logging.properties 2010-07-14 20:20:57 UTC (rev 106724)
@@ -26,7 +26,7 @@
loggers=org.jboss.jca,org.jboss,org.jnp,com.arjuna
# Root logger level
-logger.level=${jboss.jca.log.level:INFO}
+logger.level=${iron.jacamar.log.level:INFO}
logger.handlers=CONSOLE, FILE
# org.jboss.jca
@@ -44,13 +44,13 @@
# Console handler configuration
handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.jca.log.console.level:INFO}
+handler.CONSOLE.level=${iron.jacamar.log.console.level:INFO}
handler.CONSOLE.autoFlush=true
handler.CONSOLE.formatter=PATTERN
# File handler configuration
handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=${jboss.jca.log.file.level:TRACE}
+handler.FILE.level=${iron.jacamar.log.file.level:TRACE}
handler.FILE.properties=autoFlush,fileName
handler.FILE.autoFlush=true
handler.FILE.fileName=${test.dir}/core/test.log
Modified: projects/jboss-jca/trunk/core/src/test/resources/mdr-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/mdr-jboss-beans.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/core/src/test/resources/mdr-jboss-beans.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- JBoss JCA
--->
<deployment>
<bean name="MetaDataRepository" interface="org.jboss.jca.core.api.MetaDataRepository" class="org.jboss.jca.core.mdr.MetaDataRepositoryImpl">
Modified: projects/jboss-jca/trunk/core/src/test/resources/naming-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/naming-jboss-beans.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/core/src/test/resources/naming-jboss-beans.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- JBoss JCA
--->
<deployment>
<!-- Naming -->
Modified: projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase-jboss-beans.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagementModelTestCase-jboss-beans.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- JBoss JCA
--->
<deployment>
<bean name="SimpleBootstrapContext" interface="javax.resource.spi.BootstrapContext" class="org.jboss.jca.test.core.spec.chapter10.SimpleBootstrapContext">
Modified: projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase-jboss-beans.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/core/src/test/resources/org/jboss/jca/test/core/spec/chapter10/section3/WorkManagerInterfaceTestCase-jboss-beans.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- JBoss JCA
--->
<deployment>
<bean name="SimpleBootstrapContext" interface="javax.resource.spi.BootstrapContext" class="org.jboss.jca.test.core.spec.chapter10.SimpleBootstrapContext">
Modified: projects/jboss-jca/trunk/core/src/test/resources/rejecting-workmanager-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/rejecting-workmanager-jboss-beans.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/core/src/test/resources/rejecting-workmanager-jboss-beans.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- JBoss JCA
--->
<deployment>
<!-- Short running thread pool -->
Modified: projects/jboss-jca/trunk/core/src/test/resources/transaction-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/transaction-jboss-beans.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/core/src/test/resources/transaction-jboss-beans.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -45,7 +45,7 @@
<bean name="ObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
<constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getObjectStoreEnvironmentBean"/>
- <property name="objectStoreDir">${jboss.jca.home}/tmp/tx-object-store</property>
+ <property name="objectStoreDir">${iron.jacamar.home}/tmp/tx-object-store</property>
</bean>
<bean name="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBean">
Modified: projects/jboss-jca/trunk/core/src/test/resources/workmanager-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/workmanager-jboss-beans.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/core/src/test/resources/workmanager-jboss-beans.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- JBoss JCA
--->
<deployment>
<!-- Thread group -->
Modified: projects/jboss-jca/trunk/deployers/build.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/build.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/deployers/build.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project name="jboss-jca-deployers"
+<project name="ironjacamar-deployers"
default="compile"
xmlns:ivy="antlib:org.apache.ivy.ant">
@@ -51,39 +51,6 @@
<target name="jars" depends="compile">
<mkdir dir="${build.deployers.dir}/jars" />
- <!-- Main -->
- <mkdir dir="${build.deployers.dir}/jars/main" />
-
- <copy todir="${build.deployers.dir}/jars/main">
- <fileset dir="${build.deployers.dir}/impl"
- includes="**/mc/hack/**"/>
- </copy>
-
- <jar destfile="${target.dir}/jboss-jca-deployers-main.jar"
- manifest="src/main/resources/main-manifest.mf"
- basedir="${build.deployers.dir}/jars/main"/>
-
- <!-- RAR -->
- <mkdir dir="${build.deployers.dir}/jars/rar" />
- <mkdir dir="${build.deployers.dir}/jars/rar/META-INF" />
-
- <copy todir="${build.deployers.dir}/jars/rar">
- <fileset dir="${build.deployers.dir}/impl"
- includes="**/common/**,**/mc/rar/**"/>
- </copy>
-
- <copy file="src/main/resources/jca-deployers-jboss-beans.xml"
- tofile="${build.deployers.dir}/jars/rar/META-INF/jboss-beans.xml"/>
-
- <copy todir="${build.deployers.dir}/jars/rar">
- <fileset dir="src/main/resources/"
- includes="**/*.properties"/>
- </copy>
-
- <jar destfile="${target.dir}/jboss-jca-deployers-rar.jar"
- manifest="src/main/resources/rar-manifest.mf"
- basedir="${build.deployers.dir}/jars/rar"/>
-
<!-- Fungal -->
<mkdir dir="${build.deployers.dir}/jars/fungal" />
@@ -97,9 +64,15 @@
includes="**/*.properties"/>
</copy>
- <jar destfile="${target.dir}/jboss-jca-deployers-fungal.jar"
- manifest="src/main/resources/fungal-ra-manifest.mf"
- basedir="${build.deployers.dir}/jars/fungal"/>
+ <jar destfile="${target.dir}/${name}-deployers-fungal.jar"
+ basedir="${build.deployers.dir}/jars/fungal">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Deployers (Fungal)"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ </manifest>
+ </jar>
</target>
@@ -108,152 +81,133 @@
Target: test-jars
================================= -->
<target name="test-jars">
- <jar destfile="${build.deployers.dir}/ra15out.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra15out.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra15out/*.class"/>
<fileset dir="src/test/resources/ra15out.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra15inout.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra15inout.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra15inout/*.class"/>
<fileset dir="src/test/resources/ra15inout.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra15dtdinout.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra15dtdinout.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra15dtdinout/*.class"/>
<fileset dir="src/test/resources/ra15dtdinout.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra15outjbossra.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra15outjbossra.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra15outjbossra/*.class"/>
<fileset dir="src/test/resources/ra15outjbossra.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra15outjbossradefaultns.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra15outjbossradefaultns.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra15outjbossradefaultns/*.class"/>
<fileset dir="src/test/resources/ra15outjbossradefaultns.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra15inoutjbossra.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra15inoutjbossra.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra15inoutjbossra/*.class"/>
<fileset dir="src/test/resources/ra15inoutjbossra.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16out.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16out.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16out/*.class"/>
<fileset dir="src/test/resources/ra16out.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16inout.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16inout.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16inout/*.class"/>
<fileset dir="src/test/resources/ra16inout.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16dtdinout.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16dtdinout.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16dtdinout/*.class"/>
<fileset dir="src/test/resources/ra16dtdinout.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16outjbossra.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16outjbossra.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16outjbossra/*.class"/>
<fileset dir="src/test/resources/ra16outjbossra.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16outjbossradefaultns.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16outjbossradefaultns.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16outjbossradefaultns/*.class"/>
<fileset dir="src/test/resources/ra16outjbossradefaultns.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16inoutjbossra.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16inoutjbossra.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16inoutjbossra/*.class"/>
<fileset dir="src/test/resources/ra16inoutjbossra.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16outnora.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16outnora.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16outnora/*.class"/>
<fileset dir="src/test/resources/ra16outnora.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16inoutnora.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16inoutnora.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16inoutnora/*.class"/>
<fileset dir="src/test/resources/ra16inoutnora.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16inoutoverwrite.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16inoutoverwrite.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16inoutoverwrite/*.class"/>
<fileset dir="src/test/resources/ra16inoutoverwrite.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16standard303.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16standard303.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16standard303/*.class"/>
<fileset dir="src/test/resources/ra16standard303.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16standard303jbossra.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16standard303jbossra.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16standard303jbossra/*.class"/>
<fileset dir="src/test/resources/ra16standard303jbossra.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16user303.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16user303.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16user303/*.class"/>
<fileset dir="src/test/resources/ra16user303.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16user303jbossra.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16user303jbossra.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
@@ -267,15 +221,13 @@
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16inoutjar/*.class"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16inoutjar.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16inoutjar.rar">
<filelist dir="${build.deployers.dir}" files="ra16inoutjar.jar"/>
<fileset dir="src/test/resources/ra16inoutjar.rar"/>
</jar>
<delete file="${build.deployers.dir}/ra16inoutjar.jar"/>
- <jar destfile="${build.deployers.dir}/ra10dtdout.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra10dtdout.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
@@ -283,8 +235,7 @@
<fileset dir="src/test/resources/ra10dtdout.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/rafail2connector.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/rafail2connector.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
@@ -292,72 +243,63 @@
<fileset dir="src/test/resources/rafail2connector.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16inoutanno.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16inoutanno.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16inoutanno/*.class"/>
<fileset dir="src/test/resources/ra16inoutanno.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16inoutmultianno.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16inoutmultianno.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16inoutmultianno/*.class"/>
<fileset dir="src/test/resources/ra16inoutmultianno.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16annoconndefs.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16annoconndefs.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16annoconndefs/*.class"/>
<fileset dir="src/test/resources/ra16annoconndefs.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16annoconndef.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16annoconndef.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16annoconndef/*.class"/>
<fileset dir="src/test/resources/ra16annoconndef.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16annoadminobj.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16annoadminobj.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16annoadminobj/*.class"/>
<fileset dir="src/test/resources/ra16annoadminobj.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16annoauthmech.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16annoauthmech.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16annoauthmech/*.class"/>
<fileset dir="src/test/resources/ra16annoauthmech.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16annoactiv.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16annoactiv.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16annoactiv/*.class"/>
<fileset dir="src/test/resources/ra16annoactiv.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16annoconfprop.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16annoconfprop.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/ra16annoconfprop/*.class"/>
<fileset dir="src/test/resources/ra16annoconfprop.rar"/>
</jar>
- <jar destfile="${build.deployers.dir}/ra16asso.rar"
- manifest="src/main/resources/rar-manifest.mf">
+ <jar destfile="${build.deployers.dir}/ra16asso.rar">
<fileset dir="${build.deployers.dir}/test"
includes="org/jboss/jca/test/deployers/spec/rars/*.class"/>
<fileset dir="${build.deployers.dir}/test"
@@ -378,8 +320,8 @@
docletpathref="standalone.lib.path.id"
author="true"
version="true"
- windowtitle="JBoss JCA Deployers"
- doctitle="JBoss JCA Deployers"
+ windowtitle="IronJacamar Deployers"
+ doctitle="IronJacamar Deployers"
use="true"
additionalparam="-author -version"
classpath="${build.deployers.dir}/impl"
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2010-07-14 20:20:57 UTC (rev 106724)
@@ -352,7 +352,7 @@
if (f.isFile())
{
FileUtil fileUtil = new FileUtil();
- destination = new File(SecurityActions.getSystemProperty("jboss.jca.home"), "/tmp/");
+ destination = new File(SecurityActions.getSystemProperty("iron.jacamar.home"), "/tmp/");
root = fileUtil.extract(f, destination);
}
else
@@ -809,7 +809,7 @@
{
if (reportDirectory == null)
{
- reportDirectory = new File(SecurityActions.getSystemProperty("jboss.jca.home"), "/log/");
+ reportDirectory = new File(SecurityActions.getSystemProperty("iron.jacamar.home"), "/log/");
}
if (reportDirectory.exists())
{
Deleted: projects/jboss-jca/trunk/deployers/src/main/resources/fungal-ra-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/resources/fungal-ra-manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/deployers/src/main/resources/fungal-ra-manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,4 +0,0 @@
-Implementation-Title: JBoss JCA SJC RA Deployer
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
-Implementation-Version: 0.1
Deleted: projects/jboss-jca/trunk/deployers/src/main/resources/jca-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/resources/jca-deployers-jboss-beans.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/deployers/src/main/resources/jca-deployers-jboss-beans.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="RaXmlParsingDeployer" class="org.jboss.jca.deployers.mc.rar.RaXmlParsingDeployer"/>
-
-</deployment>
Deleted: projects/jboss-jca/trunk/deployers/src/main/resources/main-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/resources/main-manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/deployers/src/main/resources/main-manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,4 +0,0 @@
-Implementation-Title: JBoss JCA Deployers Main
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
-Implementation-Version: 0.1
Deleted: projects/jboss-jca/trunk/deployers/src/main/resources/rar-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/resources/rar-manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/deployers/src/main/resources/rar-manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,4 +0,0 @@
-Implementation-Title: JBoss JCA Deployers RAR
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
-Implementation-Version: 0.1
Modified: projects/jboss-jca/trunk/deployers/src/test/resources/logging.properties
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/logging.properties 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/logging.properties 2010-07-14 20:20:57 UTC (rev 106724)
@@ -26,7 +26,7 @@
loggers=org.jboss.jca,org.jboss,org.jnp,com.arjuna
# Root logger level
-logger.level=${jboss.jca.log.level:INFO}
+logger.level=${iron.jacamar.log.level:INFO}
logger.handlers=CONSOLE, FILE
# org.jboss.jca
@@ -44,13 +44,13 @@
# Console handler configuration
handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.jca.log.console.level:INFO}
+handler.CONSOLE.level=${iron.jacamar.log.console.level:INFO}
handler.CONSOLE.autoFlush=true
handler.CONSOLE.formatter=PATTERN
# File handler configuration
handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=${jboss.jca.log.file.level:TRACE}
+handler.FILE.level=${iron.jacamar.log.file.level:TRACE}
handler.FILE.properties=autoFlush,fileName
handler.FILE.autoFlush=true
handler.FILE.fileName=${test.dir}/deployers/test.log
Modified: projects/jboss-jca/trunk/doc/developerguide/build.xml
===================================================================
--- projects/jboss-jca/trunk/doc/developerguide/build.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/developerguide/build.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,7 +1,7 @@
<project name="developerguide" default="all" basedir=".">
<property name="build.dir" value="${basedir}/../../target/docs/developerguide"/>
- <property name="pdf.name" value="JBossJCADeveloperGuide.pdf"/>
+ <property name="pdf.name" value="IronJacamarDeveloperGuide.pdf"/>
<import file="${basedir}/../../tools/docbook/support.xml"/>
<target name="all" depends="clean">
Modified: projects/jboss-jca/trunk/doc/developerguide/en/master.xml
===================================================================
--- projects/jboss-jca/trunk/doc/developerguide/en/master.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/developerguide/en/master.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -12,7 +12,7 @@
]>
<book lang="en">
<bookinfo>
- <title>JBoss JCA 1.0 Developer's Guide</title>
+ <title>IronJacamar 1.0 Developer's Guide</title>
<subtitle>Connecting your Enterprise Information Systems</subtitle>
Modified: projects/jboss-jca/trunk/doc/developerguide/en/modules/building.xml
===================================================================
--- projects/jboss-jca/trunk/doc/developerguide/en/modules/building.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/developerguide/en/modules/building.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -47,7 +47,7 @@
<section id="ivy">
<title>Apache Ivy</title>
- <para>The JBoss JCA project uses Apache Ivy for dependency management.</para>
+ <para>The IronJacamar project uses Apache Ivy for dependency management.</para>
<para>Apache Ivy is automatically downloaded and included in the development
environment, so no additional setup is required.</para>
@@ -70,7 +70,7 @@
<para>The anonymous SVN repository is located under:</para>
<programlisting>
-svn co http://anonsvn.jboss.org/repos/jbossas/projects/jboss-jca/trunk/ jbossjca-trunk
+svn co http://anonsvn.jboss.org/repos/jbossas/projects/jboss-jca/trunk/ ironjacamar-trunk
</programlisting>
</section>
@@ -80,7 +80,7 @@
<para>The developer SVN repository is located under:</para>
<programlisting>
-svn co https://svn.jboss.org/repos/jbossas/projects/jboss-jca/trunk/ jbossjca-trunk
+svn co https://svn.jboss.org/repos/jbossas/projects/jboss-jca/trunk/ ironjacamar-trunk
</programlisting>
</section>
@@ -100,7 +100,7 @@
<section id="compiling">
<title>Compiling the source code</title>
- <para>In order to build the JBoss JCA project you execute:</para>
+ <para>In order to build the IronJacamar project you execute:</para>
<programlisting>
ant <target>
</programlisting>
@@ -124,7 +124,7 @@
</listitem>
<listitem>
<para>sjc</para>
- <para>Builds the standalone environment using JBoss JCA/SJC.</para>
+ <para>Builds the standalone environment using IronJacamar/SJC.</para>
</listitem>
<listitem>
<para>release</para>
@@ -141,7 +141,7 @@
</itemizedlist>
<para>See the full list of targets in the main build.xml file.</para>
- <para>An example to get the JBoss JCA/SJC built and running:</para>
+ <para>An example to get the IronJacamar/SJC built and running:</para>
<programlisting>
ant clean sjc
cd target/sjc/bin
Modified: projects/jboss-jca/trunk/doc/developerguide/en/modules/metadata.xml
===================================================================
--- projects/jboss-jca/trunk/doc/developerguide/en/modules/metadata.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/developerguide/en/modules/metadata.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -4,7 +4,7 @@
<section id="coremetadata">
<title>Core Metadata</title>
- <para>The metadata for the JBoss JCA project is split up into the following areas</para>
+ <para>The metadata for the IronJacamar project is split up into the following areas</para>
<itemizedlist spacing="compact">
<listitem>
Modified: projects/jboss-jca/trunk/doc/developerguide/en/modules/standalone.xml
===================================================================
--- projects/jboss-jca/trunk/doc/developerguide/en/modules/standalone.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/developerguide/en/modules/standalone.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -5,59 +5,54 @@
<section id="standaloneoverview">
<title>Overview</title>
- <para>The standalone JBoss JCA container implements Chapter 3 Section 5 of the
+ <para>The standalone IronJacamar container implements Chapter 3 Section 5 of the
JCA 1.6 specification which defines a standalone JCA environment.</para>
<para>The standalone container has the following layout:</para>
<itemizedlist>
<listitem>
- <code>$JBOSS_JCA_HOME/bin/</code>
+ <code>$IRON_JACAMAR_HOME/bin/</code>
<para>contains the run scripts and the SJC kernel.</para>
</listitem>
<listitem>
- <code>$JBOSS_JCA_HOME/config/</code>
+ <code>$IRON_JACAMAR_HOME/config/</code>
<para>contains the configuration of the container.</para>
</listitem>
<listitem>
- <code>$JBOSS_JCA_HOME/deploy/</code>
+ <code>$IRON_JACAMAR_HOME/deploy/</code>
<para>contains the user deployments.</para>
</listitem>
<listitem>
- <code>$JBOSS_JCA_HOME/lib/</code>
+ <code>$IRON_JACAMAR_HOME/lib/</code>
<para>contains all the libraries used by the container.</para>
</listitem>
<listitem>
- <code>$JBOSS_JCA_HOME/log/</code>
+ <code>$IRON_JACAMAR_HOME/log/</code>
<para>contains the log files.</para>
</listitem>
<listitem>
- <code>$JBOSS_JCA_HOME/tmp/</code>
+ <code>$IRON_JACAMAR_HOME/tmp/</code>
<para>contains temporary files.</para>
</listitem>
</itemizedlist>
<para>To start the container execute the following</para>
<programlisting>
-cd $JBOSS_JCA_HOME/bin
+cd $IRON_JACAMAR_HOME/bin
./run.sh
</programlisting>
<para>.</para>
</section>
- <section id="jbossmc">
- <title>JBoss Microcontainer</title>
-
- </section>
-
<section id="jcasjc">
- <title>JBoss JCA/SJC</title>
+ <title>IronJacamar/SJC</title>
<warning>
This standalone configuration is for development purposes only.
</warning>
- <para>The JBoss JCA/SJC uses the Fungal kernel for its run-time environment.</para>
+ <para>The IronJacamar/SJC uses the Fungal kernel for its run-time environment.</para>
<para>The homepage for the Fungal is <ulink url="http://jesperpedersen.github.com/fungal">http://jesperpedersen.github.com/fungal</ulink></para>.
Modified: projects/jboss-jca/trunk/doc/developerguide/en/modules/testing.xml
===================================================================
--- projects/jboss-jca/trunk/doc/developerguide/en/modules/testing.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/developerguide/en/modules/testing.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -74,7 +74,7 @@
<para>The official Java Connector Architecture API (javax.resource)</para>
</listitem>
<listitem>
- <para>The JBoss JCA specific APIs (org.jboss.jca.xxx.api)</para>
+ <para>The IronJacamar specific APIs (org.jboss.jca.xxx.api)</para>
</listitem>
<listitem>
<para>Interfaces and classes in the test suite that extends/implements these APIs</para>
@@ -100,10 +100,10 @@
<para>The official Java Connector Architecture API (javax.resource)</para>
</listitem>
<listitem>
- <para>The JBoss JCA specific APIs (org.jboss.jca.xxx.api)</para>
+ <para>The IronJacamar specific APIs (org.jboss.jca.xxx.api)</para>
</listitem>
<listitem>
- <para>The JBoss JCA specific implementation (org.jboss.jca.xxx.yyy)</para>
+ <para>The IronJacamar specific implementation (org.jboss.jca.xxx.yyy)</para>
</listitem>
<listitem>
<para>Interfaces and classes in the test suite</para>
@@ -248,7 +248,7 @@
<section id="qa">
<title>Quality Assurance</title>
- <para>In addition to the test suite the JBoss JCA project deploys various
+ <para>In addition to the test suite the IronJacamar project deploys various
tools to increase the stability of the project.</para>
<para>The following sections will describe each of these tools.</para>
@@ -281,7 +281,7 @@
<para>Findbugs is a tool that scans your project for bugs and provides reports based on its
findings.</para>
- <para>This tool helps lower of the number of bugs found in the JBoss JCA project.</para>
+ <para>This tool helps lower of the number of bugs found in the IronJacamar project.</para>
<para>The goal is to have zero errors in the report and as few exclusions in the filter as possible.
The findbugs report is generated using</para>
@@ -305,7 +305,7 @@
<para>Cobertura generates a test suite matrix for your project which helps you identify
where you need additional test coverage.</para>
- <para>The reports that the tool provides makes sure that the JBoss JCA project has the correct test coverage.</para>
+ <para>The reports that the tool provides makes sure that the IronJacamar project has the correct test coverage.</para>
<para>The goal is to have as high code coverage as possible in all areas. The Cobertura report is
generated using</para>
@@ -328,7 +328,7 @@
<title>Tattletale</title>
<para>Tattletale generates reports about different quality matrix of the dependencies within the project.</para>
- <para>The reports that the tool provides makes sure that the JBoss JCA project doesn't for example have
+ <para>The reports that the tool provides makes sure that the IronJacamar project doesn't for example have
cyclic dependencies within the project.</para>
<para>The goal is to have as no issues flagged by the tool. The Tattletale reports are
Modified: projects/jboss-jca/trunk/doc/userguide/build.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/build.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/userguide/build.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,7 +1,7 @@
<project name="userguide" default="all" basedir=".">
<property name="build.dir" value="${basedir}/../../target/docs/userguide"/>
- <property name="pdf.name" value="JBossJCAUsersGuide.pdf"/>
+ <property name="pdf.name" value="IronJacamarUsersGuide.pdf"/>
<import file="${basedir}/../../tools/docbook/support.xml"/>
<target name="all" depends="clean">
Modified: projects/jboss-jca/trunk/doc/userguide/en/master.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en/master.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/userguide/en/master.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -16,7 +16,7 @@
]>
<book lang="en">
<bookinfo>
- <title>JBoss JCA 1.0 User's Guide</title>
+ <title>IronJacamar 1.0 User's Guide</title>
<subtitle>Connecting your Enterprise Information Systems</subtitle>
Modified: projects/jboss-jca/trunk/doc/userguide/en/modules/about.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en/modules/about.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/userguide/en/modules/about.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,22 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter id="about">
- <title>About JBoss JCA</title>
+ <title>About IronJacamar</title>
- <para>The goal of the JBoss JCA project is to provide an implementation of the Java Connector
+ <para>The goal of the IronJacamar project is to provide an implementation of the Java Connector
Architecture 1.6 specification.</para>
<para>The specification can be found here: <ulink url="http://www.jcp.org/en/jsr/detail?id=322">http://www.jcp.org/en/jsr/detail?id=322</ulink>.</para>
+ <section id="whythename">
+ <title>Why IronJacamar ?</title>
+
+ <para>The Java EE Connector Architecture container can be viewed as a foundation inside an application server
+ as it provides connectivity to the other containers such that they can communicate with EISes. Iron is offen
+ used as foundation in building houses too.</para>
+
+ <para>The Jacamar bird family which lives in Central and South America are glossy elegant birds with long bills
+ and tails. Why we picked the Jacamar family is left as an exercise for the reader :)</para>
+
+ </section>
+
<section id="theteam">
<title>The team</title>
- <para>Jesper Pedersen acts as the lead for the JBoss JCA project. He can be reached at jesper (dot) pedersen (at) jboss (dot) org.</para>
+ <para>Jesper Pedersen acts as the lead for the IronJacamar project. He can be reached at jesper (dot) pedersen (at) jboss (dot) org.</para>
- <para>Jeff Zhang is a core developer on the JBoss JCA project. He can be reached at jizhang (at) redhat (dot) com.</para>
+ <para>Jeff Zhang is a core developer on the IronJacamar project. He can be reached at jizhang (at) redhat (dot) com.</para>
- <para>Gurkan Erdogdu is a core developer on the JBoss JCA project. He can be reached at gurkanerdogdu (at) yahoo (dot) com.</para>
+ <para>Stefano Maestri is a core developer on the IronJacamar project. He can be reached at stefano.maestri (at) redhat (dot) com.</para>
- <para>Stefano Maestri is a core developer on the JBoss JCA project. He can be reached at stefano.maestri (at) javalinux (dot) it.</para>
+ <para>Gurkan Erdogdu is a core developer on the IronJacamar project. He can be reached at gurkanerdogdu (at) yahoo (dot) com.</para>
</section>
Modified: projects/jboss-jca/trunk/doc/userguide/en/modules/codegenerator.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en/modules/codegenerator.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/userguide/en/modules/codegenerator.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -5,7 +5,7 @@
<section id="codegenerator_introduction">
<title>Introduction</title>
- <para>The JBoss JCA project includes a resource adapter code generator which can
+ <para>The IronJacamar project includes a resource adapter code generator which can
generate a complete code skeleton that will help developers get started with
their development tasks.</para>
Modified: projects/jboss-jca/trunk/doc/userguide/en/modules/community.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en/modules/community.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/userguide/en/modules/community.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -14,7 +14,7 @@
<section id="userforum">
<title>User forum</title>
- <para>The user forum is where we discuss matters about the usage of the JBoss JCA project.</para>
+ <para>The user forum is where we discuss matters about the usage of the IronJacamar project.</para>
<para>Our forum is located at <ulink url="http://www.jboss.org/index.html?module=bb&op=viewforum&f=136">http://www.jboss.org/index.html?module=bb&op=viewforum&f=136</ulink></para>
@@ -23,7 +23,7 @@
<section id="developerforum">
<title>Developer forum</title>
- <para>The developer forum is where we discuss the implementation of the JBoss JCA project. This means the internals of the project and
+ <para>The developer forum is where we discuss the implementation of the IronJacamar project. This means the internals of the project and
not how the project is used.</para>
<para>User questions doesn't belong here - they should go in the user forum instead.</para>
Modified: projects/jboss-jca/trunk/doc/userguide/en/modules/configuration.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en/modules/configuration.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/userguide/en/modules/configuration.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -2,12 +2,12 @@
<chapter id="configuration">
<title>Configuration</title>
- <para>The configuration for the JBoss JCA container is located in the config/ directory.</para>
+ <para>The configuration for the IronJacamar container is located in the config/ directory.</para>
<section id="logging">
<title>Logging service</title>
- <para>The JBoss JCA container uses JBoss Logging framework as the implementation.</para>
+ <para>The IronJacamar container uses JBoss Logging framework as the implementation.</para>
<para>The configuration is done in the</para>
@@ -25,7 +25,7 @@
<section id="transaction">
<title>Transaction service</title>
- <para>The JBoss JCA container uses the JBoss Transaction Manager as its transaction implementation.</para>
+ <para>The IronJacamar container uses the JBoss Transaction Manager as its transaction implementation.</para>
<para>The configuration is done in the</para>
@@ -45,7 +45,7 @@
<section id="jca_deployer">
<title>Deployer</title>
- <para>The JBoss JCA deployer is configured in the</para>
+ <para>The IronJacamar deployer is configured in the</para>
<programlisting>
config/bootstrap/jca.xml
@@ -202,8 +202,8 @@
<bean name="UsersRoles"
interface="org.jboss.jca.core.spi.security.Callback"
class="org.jboss.jca.core.security.UsersRoles">
- <property name="UsersProperties">${jboss.jca.home}/config/users.properties</property>
- <property name="RolesProperties">${jboss.jca.home}/config/roles.properties</property>
+ <property name="UsersProperties">${iron.jacamar.home}/config/users.properties</property>
+ <property name="RolesProperties">${iron.jacamar.home}/config/roles.properties</property>
</bean>
]]>
</programlisting>
@@ -215,7 +215,7 @@
<section id="webserver">
<title>Web server</title>
- <para>The JBoss JCA project features a web server which is used to serve web archive deployments.</para>
+ <para>The IronJacamar project features a web server which is used to serve web archive deployments.</para>
<para>The configuration is done in the</para>
Modified: projects/jboss-jca/trunk/doc/userguide/en/modules/deployment.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en/modules/deployment.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/userguide/en/modules/deployment.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -2,7 +2,7 @@
<chapter id="deployment">
<title>Deployment</title>
- <para>The JBoss JCA distribution contains a deploy/ directory where all deployments
+ <para>The IronJacamar distribution contains a deploy/ directory where all deployments
should be deployed to.</para>
<section id="deployingrar">
@@ -12,13 +12,13 @@
deploy/ directory</para>
<programlisting>
-cp example.rar jboss-jca-1.0.0/deploy
+cp example.rar ironjacamar-1.0.0/deploy
</programlisting>
<para>on a Un*x based system or</para>
<programlisting>
-copy example.rar jboss-jca-1.0.0\deploy
+copy example.rar ironjacamar-1.0.0\deploy
</programlisting>
<para>on Windows.</para>
Modified: projects/jboss-jca/trunk/doc/userguide/en/modules/download.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en/modules/download.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/userguide/en/modules/download.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter id="gettingstarted">
<title>Download</title>
- <para>The official JBoss JCA project page is <ulink
+ <para>The official IronJacamar project page is <ulink
url="http://www.jboss.org/jca/">http://www.jboss.org/jca/</ulink> where you can download the software.</para>
<section id="download">
@@ -12,7 +12,7 @@
<para>Each release is labelled with a version number and an identifier.</para>
<programlisting>
-jboss-jca-<major>.<minor>.<patch>[.<identifier>]
+ironjacamar-<major>.<minor>.<patch>[.<identifier>]
</programlisting>
<para>where</para>
@@ -49,7 +49,7 @@
<para>An example</para>
<programlisting>
-jboss-jca-1.0.0.tar.gz
+ironjacamar-1.0.0.tar.gz
</programlisting>
<para>which is the first stable release of the project.</para>
@@ -65,7 +65,7 @@
<para>The anonymous SVN repository is located under:</para>
<programlisting>
-svn co http://anonsvn.jboss.org/repos/jbossas/projects/jboss-jca/trunk/ jbossjca-trunk
+svn co http://anonsvn.jboss.org/repos/jbossas/projects/jboss-jca/trunk/ ironjacamar-trunk
</programlisting>
<para>You can find additional information about this in the developer guide.</para>
Modified: projects/jboss-jca/trunk/doc/userguide/en/modules/embedded.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en/modules/embedded.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/userguide/en/modules/embedded.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -5,7 +5,7 @@
<section id="embedded_overview">
<title>Overview</title>
- <para>The JBoss JCA embedded configuration provides a way of running a JCA container
+ <para>The IronJacamar embedded configuration provides a way of running a JCA container
in-VM.</para>
<para>The configuration is useful when you want a</para>
@@ -46,14 +46,14 @@
<section id="embedded_usage">
<title>Usage</title>
- <para>JBoss JCA Embedded supports both a simple and an advanced usage model, using pre-assembled
+ <para>IronJacamar Embedded supports both a simple and an advanced usage model, using pre-assembled
resource adapter archives (.rar) or dynamic resource adapter archives based on ShrinkWrap.</para>
<section id="embedded_usage_simple">
<title>Simple usage</title>
<para>The code sample below shows a simple usage of deploying a pre-assembled resource adapter archive
- into the JBoss JCA Embedded environment.</para>
+ into the IronJacamar Embedded environment.</para>
<programlisting>
import org.jboss.jca.embedded.EmbeddedJCA;
@@ -142,14 +142,14 @@
- either representing a file or a directory.</note>
</callout>
- <para>See the JBoss JCA Embedded API documentation for additional functionality.</para>
+ <para>See the IronJacamar Embedded API documentation for additional functionality.</para>
</section>
<section id="embedded_usage_advanced">
<title>Advanced usage</title>
- <para>The JBoss JCA Embedded container environment supports the following open source
+ <para>The IronJacamar Embedded container environment supports the following open source
testing projects:</para>
<orderedlist>
@@ -172,7 +172,7 @@
<title>ShrinkWrap integration</title>
<para>The code sample below shows an advanced usage of deploying a dynamic ShrinkWrap resource adapter archive
- into the JBoss JCA Embedded environment.</para>
+ into the IronJacamar Embedded environment.</para>
<programlisting>
<![CDATA[
@@ -312,9 +312,9 @@
<title>Arquillian integration</title>
<para>The code sample below shows an advanced usage of deploying a dynamic ShrinkWrap resource adapter archive
- into the JBoss JCA Embedded environment using Arquillian.</para>
+ into the IronJacamar Embedded environment using Arquillian.</para>
- <para>This setup allows the developer to skip the entire JBoss JCA Embedded container setup and handling of its
+ <para>This setup allows the developer to skip the entire IronJacamar Embedded container setup and handling of its
lifecycle methods.</para>
<programlisting>
Modified: projects/jboss-jca/trunk/doc/userguide/en/modules/installation.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en/modules/installation.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/userguide/en/modules/installation.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -10,13 +10,13 @@
<para>Extract the distribution using</para>
<programlisting>
-tar xzf jboss-jca-1.0.0.tar.gz
+tar xzf ironjacamar-1.0.0.tar.gz
</programlisting>
<para>The distribution will be located in a directory named</para>
<programlisting>
-jboss-jca-1.0.0
+ironjacamar-1.0.0
</programlisting>
</section>
@@ -27,7 +27,7 @@
<para>Extract the distribution using</para>
<programlisting>
-unzip jboss-jca-1.0.0.tar.gz
+unzip ironjacamar-1.0.0.tar.gz
</programlisting>
<para>or any program capable of handling Zip archives such as WinZip and WinRar.</para>
@@ -35,7 +35,7 @@
<para>The distribution will be located in a directory named</para>
<programlisting>
-jboss-jca-1.0.0
+ironjacamar-1.0.0
</programlisting>
</section>
@@ -43,7 +43,7 @@
<section id="directorystructure">
<title>Directory structure</title>
- <para>The JBoss JCA container has the following directory structure:</para>
+ <para>The IronJacamar container has the following directory structure:</para>
<itemizedlist spacing="compact">
<listitem>
Modified: projects/jboss-jca/trunk/doc/userguide/en/modules/running.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en/modules/running.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/userguide/en/modules/running.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -5,10 +5,10 @@
<section id="startingthecontainer">
<title>Starting the container</title>
- <para>The JBoss JCA container is started by entering the bin/ directory</para>
+ <para>The IronJacamar container is started by entering the bin/ directory</para>
<programlisting>
-cd jboss-jca-1.0.0/bin
+cd ironjacamar-1.0.0/bin
</programlisting>
<para>and executing</para>
@@ -53,7 +53,7 @@
<section id="cli">
<title>Command line interface</title>
- <para>The JBoss JCA container can be controlled by a command line interface.</para>
+ <para>The IronJacamar container can be controlled by a command line interface.</para>
<section id="cli_deploy">
<title>Deploy</title>
@@ -84,7 +84,7 @@
<section id="cli_shutdown">
<title>Shutdown</title>
- <para>You can shutdown the JBoss JCA environment by</para>
+ <para>You can shutdown the IronJacamar environment by</para>
<programlisting>
java -jar fungal-cli.jar shutdown
Modified: projects/jboss-jca/trunk/doc/userguide/en/modules/validator.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en/modules/validator.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/doc/userguide/en/modules/validator.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -5,7 +5,7 @@
<section id="validator_introduction">
<title>Introduction</title>
- <para>The JBoss JCA container features a validator which checks resource adapter archives
+ <para>The IronJacamar container features a validator which checks resource adapter archives
against the Java Connector Architecture (JCA) specification.</para>
<para>The validator is doing a static analysis of the resource adapter classes
@@ -99,7 +99,7 @@
<para>The validator can be run on the command line by</para>
<programlisting>
-java -jar jboss-jca-validator.jar <file>
+java -jar ironjacamar-validator.jar <file>
</programlisting>
<para>The reports will be generated into the current directory under the name of
@@ -111,14 +111,14 @@
<title>Apache Ant integration</title>
<para>The validator integrates with Apache Ant such that you can generate the reports directly from
- your build environment before deploying the resoruce adapter into the JBoss JCA container.</para>
+ your build environment before deploying the resoruce adapter into the IronJacamar container.</para>
<para>First you have to define the <code>taskdef</code> for the task</para>
<programlisting>
<taskdef name="validator"
classname="org.jboss.jca.validator.ant.ValidatorTask"
- classpathref="jbossjca.lib.path.id"/>
+ classpathref="ironjacamar.lib.path.id"/>
</programlisting>
<para>See the Apache Ant documentation for additional instructions on installation.</para>
Modified: projects/jboss-jca/trunk/embedded/build.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/build.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/embedded/build.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project name="jboss-jca-embedded"
+<project name="ironjacamar-embedded"
default="compile"
xmlns:ivy="antlib:org.apache.ivy.ant">
@@ -58,10 +58,16 @@
<fileset dir="src/main/resources"
includes="*.xml,*.properties"/>
</copy>
- <jar destfile="${target.dir}/jboss-jca-embedded.jar"
- manifest="src/main/resources/embedded-manifest.mf"
+ <jar destfile="${target.dir}/${name}-embedded.jar"
basedir="${build.embedded.dir}/impl"
- excludes="META-INF/services/**,**/arquillian/**,**/*.java"/>
+ excludes="META-INF/services/**,**/arquillian/**,**/*.java">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Embedded"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ </manifest>
+ </jar>
<mkdir dir="${build.embedded.dir}/impl/META-INF"/>
<mkdir dir="${build.embedded.dir}/impl/META-INF/services"/>
@@ -69,11 +75,17 @@
<fileset dir="src/main/resources/services" includes="*"/>
</copy>
- <jar destfile="${target.dir}/jboss-jca-embedded-arquillian.jar"
- manifest="src/main/resources/arquillian-manifest.mf"
+ <jar destfile="${target.dir}/${name}-embedded-arquillian.jar"
basedir="${build.embedded.dir}/impl"
includes="META-INF/**,**/arquillian/**"
- excludes="**/*.xml,**/*.java"/>
+ excludes="**/*.xml,**/*.java">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Embedded"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ </manifest>
+ </jar>
</target>
<!-- =================================
@@ -88,8 +100,8 @@
docletpathref="sjc.lib.path.id"
author="true"
version="true"
- windowtitle="JBoss JCA Embedded"
- doctitle="JBoss JCA Embedded"
+ windowtitle="IronJacamar Embedded"
+ doctitle="IronJacamar Embedded"
use="true"
additionalparam="-author -version"
classpath="${build.embedded.dir}/impl"
Modified: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java 2010-07-14 20:20:57 UTC (rev 106724)
@@ -39,7 +39,7 @@
import com.github.fungal.api.configuration.KernelConfiguration;
/**
- * The embedded JBoss JCA container
+ * The embedded IronJacamar container
* @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
*/
public class EmbeddedJCA
@@ -82,7 +82,8 @@
public void startup() throws Throwable
{
KernelConfiguration kernelConfiguration = new KernelConfiguration();
- kernelConfiguration = kernelConfiguration.name("jboss.jca");
+ kernelConfiguration = kernelConfiguration.name("iron.jacamar");
+ kernelConfiguration = kernelConfiguration.home(null);
kernelConfiguration = kernelConfiguration.classLoader(ClassLoaderFactory.TYPE_PARENT_FIRST);
kernelConfiguration = kernelConfiguration.parallelDeploy(false);
kernelConfiguration = kernelConfiguration.remoteAccess(false);
Deleted: projects/jboss-jca/trunk/embedded/src/main/resources/arquillian-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/arquillian-manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/arquillian-manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,4 +0,0 @@
-Implementation-Title: JBoss JCA Embedded / Arquillian
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
-Implementation-Version: 0.1
Deleted: projects/jboss-jca/trunk/embedded/src/main/resources/embedded-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/embedded-manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/embedded-manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,4 +0,0 @@
-Implementation-Title: JBoss JCA Embedded
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
-Implementation-Version: 0.1
Modified: projects/jboss-jca/trunk/embedded/src/main/resources/naming.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/naming.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/naming.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -31,13 +31,13 @@
<!-- The bootstrap JNP server bind address. This also sets the default
RMI service bind address. Empty == all addresses
-->
- <property name="bindAddress">${jboss.jca.bindaddress:localhost}</property>
+ <property name="bindAddress">${iron.jacamar.bindaddress:localhost}</property>
<!-- The port of the RMI naming service, 0 == anonymous -->
<property name="rmiPort">0</property>
<!-- The RMI service bind address. Empty == all addresses -->
- <property name="rmiBindAddress">${jboss.jca.bindaddress:localhost}</property>
+ <property name="rmiBindAddress">${iron.jacamar.bindaddress:localhost}</property>
<!-- Set the java.rmi.server.hostname system property to rmiBindAddress -->
<property name="enableRmiServerHostname">true</property>
Modified: projects/jboss-jca/trunk/embedded/src/main/resources/transaction.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/transaction.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/transaction.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -45,7 +45,7 @@
<bean name="ObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
<constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getObjectStoreEnvironmentBean"/>
- <property name="objectStoreDir">${jboss.jca.home}/tmp/tx-object-store</property>
+ <property name="objectStoreDir">${iron.jacamar.home}/tmp/tx-object-store</property>
</bean>
<bean name="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBean">
Modified: projects/jboss-jca/trunk/embedded/src/test/resources/logging.properties
===================================================================
--- projects/jboss-jca/trunk/embedded/src/test/resources/logging.properties 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/embedded/src/test/resources/logging.properties 2010-07-14 20:20:57 UTC (rev 106724)
@@ -26,7 +26,7 @@
loggers=org.jboss.jca,org.jboss,org.jnp,com.arjuna
# Root logger level
-logger.level=${jboss.jca.log.level:INFO}
+logger.level=${iron.jacamar.log.level:INFO}
logger.handlers=CONSOLE, FILE
# org.jboss.jca
@@ -44,13 +44,13 @@
# Console handler configuration
handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.jca.log.console.level:INFO}
+handler.CONSOLE.level=${iron.jacamar.log.console.level:INFO}
handler.CONSOLE.autoFlush=true
handler.CONSOLE.formatter=PATTERN
# File handler configuration
handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=${jboss.jca.log.file.level:DEBUG}
+handler.FILE.level=${iron.jacamar.log.file.level:DEBUG}
handler.FILE.properties=autoFlush,fileName
handler.FILE.autoFlush=true
handler.FILE.fileName=${test.dir}/deployers/test.log
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/ivy.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -24,7 +24,7 @@
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
<info organisation="org.jboss"
- module="jboss-jca">
+ module="ironjacamar">
<license name="lgpl" url="http://repository.jboss.org/licenses/lgpl.txt"/>
<repository name="jboss" url="http://repository.jboss.org"/>
</info>
Modified: projects/jboss-jca/trunk/sjc/build.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/build.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/sjc/build.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project name="jboss-jca-sjc"
+<project name="ironjacamar-sjc"
default="compile"
xmlns:ivy="antlib:org.apache.ivy.ant">
@@ -54,9 +54,16 @@
Target: jars
================================= -->
<target name="jars" depends="compile">
- <jar destfile="${target.dir}/jboss-jca-sjc.jar"
- manifest="src/main/resources/sjc-manifest.mf"
- basedir="${build.sjc.dir}/impl"/>
+ <jar destfile="${target.dir}/${name}-sjc.jar"
+ basedir="${build.sjc.dir}/impl">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar SJC"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ <attribute name="Main-Class" value="org.jboss.jca.sjc.Main"/>
+ </manifest>
+ </jar>
</target>
<!-- =================================
@@ -71,8 +78,8 @@
docletpathref="sjc.lib.path.id"
author="true"
version="true"
- windowtitle="JBoss JCA SJC"
- doctitle="JBoss JCA SJC"
+ windowtitle="IronJacamar SJC"
+ doctitle="IronJacamar SJC"
use="true"
additionalparam="-author -version"
classpath="${build.sjc.dir}/impl"
@@ -110,11 +117,11 @@
</fileset>
</copy>
- <!-- Build a jboss-jca-sjc.jar containing all dependencies -->
+ <!-- Build a ${name}-sjc.jar containing all dependencies -->
<mkdir dir="${build.sjc.dir}/tmp"/>
<unjar src="${lib.dir}/sjc/fungal.jar" dest="${build.sjc.dir}/tmp"/>
- <unjar src="${target.dir}/jboss-jca-sjc.jar" dest="${build.sjc.dir}/tmp"/>
- <jar destfile="${target.dir}/sjc/bin/jboss-jca-sjc.jar"
+ <unjar src="${target.dir}/${name}-sjc.jar" dest="${build.sjc.dir}/tmp"/>
+ <jar destfile="${target.dir}/sjc/bin/${name}-sjc.jar"
manifest="${build.sjc.dir}/tmp/META-INF/MANIFEST.MF"
basedir="${build.sjc.dir}/tmp"/>
<delete dir="${build.sjc.dir}/tmp"/>
@@ -147,21 +154,21 @@
<copy todir="${target.dir}/sjc/lib">
<fileset dir="${target.dir}">
<include name="*.jar"/>
- <exclude name="jboss-jca-codegenerator.jar"/>
- <exclude name="jboss-jca-deployers-main.jar"/>
- <exclude name="jboss-jca-deployers-rar.jar"/>
- <exclude name="jboss-jca-embedded-arquillian.jar"/>
- <exclude name="jboss-jca-embedded.jar"/>
- <exclude name="jboss-jca-sjc.jar"/>
- <exclude name="jboss-jca-standalone.jar"/>
- <exclude name="jboss-jca-web-console.jar"/>
+ <exclude name="${name}-codegenerator.jar"/>
+ <exclude name="${name}-deployers-main.jar"/>
+ <exclude name="${name}-deployers-rar.jar"/>
+ <exclude name="${name}-embedded-arquillian.jar"/>
+ <exclude name="${name}-embedded.jar"/>
+ <exclude name="${name}-sjc.jar"/>
+ <exclude name="${name}-standalone.jar"/>
+ <exclude name="${name}-web-console.jar"/>
</fileset>
</copy>
<copy todir="${target.dir}/sjc/lib/embedded">
<fileset dir="${target.dir}">
- <include name="jboss-jca-embedded-arquillian.jar"/>
- <include name="jboss-jca-embedded.jar"/>
+ <include name="${name}-embedded-arquillian.jar"/>
+ <include name="${name}-embedded.jar"/>
</fileset>
</copy>
@@ -225,7 +232,7 @@
<copy todir="${target.dir}/sjc/doc/codegenerator">
<fileset dir="${target.dir}">
- <include name="jboss-jca-codegenerator.jar"/>
+ <include name="${name}-codegenerator.jar"/>
</fileset>
</copy>
Modified: projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/Main.java
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/Main.java 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/Main.java 2010-07-14 20:20:57 UTC (rev 106724)
@@ -32,7 +32,7 @@
import com.github.fungal.api.configuration.KernelConfiguration;
/**
- * The main class for JBoss JCA SJC
+ * The main class for IronJacamar SJC
* @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
*/
public class Main
@@ -60,7 +60,7 @@
try
{
KernelConfiguration kernelConfiguration = new KernelConfiguration();
- kernelConfiguration = kernelConfiguration.name("jboss.jca");
+ kernelConfiguration = kernelConfiguration.name("iron.jacamar");
kernelConfiguration = kernelConfiguration.classLoader(ClassLoaderFactory.TYPE_PARENT_FIRST);
kernelConfiguration = kernelConfiguration.parallelDeploy(false);
kernelConfiguration = kernelConfiguration.remoteAccess(true);
@@ -68,7 +68,7 @@
kernelConfiguration = kernelConfiguration.eventListener(new PostClassLoaderEventListener());
kernelConfiguration = kernelConfiguration.command(new Shutdown());
- String home = SecurityActions.getSystemProperty("jboss.jca.home");
+ String home = SecurityActions.getSystemProperty("iron.jacamar.home");
if (home != null)
{
kernelConfiguration.home(new File(home).toURI().toURL());
Modified: projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -90,8 +90,8 @@
<bean name="UsersRoles"
interface="org.jboss.jca.core.spi.security.Callback"
class="org.jboss.jca.core.security.UsersRoles">
- <property name="UsersProperties">${jboss.jca.home}/config/users.properties</property>
- <property name="RolesProperties">${jboss.jca.home}/config/roles.properties</property>
+ <property name="UsersProperties">${iron.jacamar.home}/config/users.properties</property>
+ <property name="RolesProperties">${iron.jacamar.home}/config/roles.properties</property>
</bean>
<!-- Work Manager -->
Modified: projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/naming.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/naming.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/naming.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -31,13 +31,13 @@
<!-- The bootstrap JNP server bind address. This also sets the default
RMI service bind address. Empty == all addresses
-->
- <property name="bindAddress">${jboss.jca.bindaddress:localhost}</property>
+ <property name="bindAddress">${iron.jacamar.bindaddress:localhost}</property>
<!-- The port of the RMI naming service, 0 == anonymous -->
<property name="rmiPort">0</property>
<!-- The RMI service bind address. Empty == all addresses -->
- <property name="rmiBindAddress">${jboss.jca.bindaddress:localhost}</property>
+ <property name="rmiBindAddress">${iron.jacamar.bindaddress:localhost}</property>
<!-- Set the java.rmi.server.hostname system property to rmiBindAddress -->
<property name="enableRmiServerHostname">true</property>
Modified: projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/transaction.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/transaction.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/transaction.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -45,7 +45,7 @@
<bean name="ObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
<constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getObjectStoreEnvironmentBean"/>
- <property name="objectStoreDir">${jboss.jca.home}/tmp/tx-object-store</property>
+ <property name="objectStoreDir">${iron.jacamar.home}/tmp/tx-object-store</property>
</bean>
<bean name="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBean">
Modified: projects/jboss-jca/trunk/sjc/src/main/resources/logging.properties
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/logging.properties 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/logging.properties 2010-07-14 20:20:57 UTC (rev 106724)
@@ -26,7 +26,7 @@
loggers=org.jboss.jca,org.jboss,org.jnp,com.arjuna,org.eclipse.jetty
# Root logger level
-logger.level=${jboss.jca.log.level:INFO}
+logger.level=${iron.jacamar.log.level:INFO}
logger.handlers=CONSOLE, FILE
# org.jboss.jca
@@ -47,16 +47,16 @@
# Console handler configuration
handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.jca.log.console.level:INFO}
+handler.CONSOLE.level=${iron.jacamar.log.console.level:INFO}
handler.CONSOLE.autoFlush=true
handler.CONSOLE.formatter=PATTERN
# File handler configuration
handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=${jboss.jca.log.file.level:DEBUG}
+handler.FILE.level=${iron.jacamar.log.file.level:DEBUG}
handler.FILE.properties=autoFlush,fileName
handler.FILE.autoFlush=true
-handler.FILE.fileName=${jboss.jca.home}/log/server.log
+handler.FILE.fileName=${iron.jacamar.home}/log/server.log
handler.FILE.formatter=PATTERN
# Formatter pattern configuration
Modified: projects/jboss-jca/trunk/sjc/src/main/resources/run.bat
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/run.bat 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/run.bat 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,6 +1,6 @@
@echo off
rem -------------------------------------------------------------------------
-rem JBoss JCA Script for Windows
+rem IronJacamar Script for Windows
rem -------------------------------------------------------------------------
rem $Id: $
@@ -15,8 +15,8 @@
)
pushd %DIRNAME%..
-if "x%JBOSS_JCA_HOME%" == "x" (
- set "JBOSS_JCA_HOME=%CD%"
+if "x%IRON_JACAMAR_HOME%" == "x" (
+ set "IRON_JACAMAR_HOME=%CD%"
)
popd
@@ -36,10 +36,10 @@
set "JAVA=%JAVA_HOME%\bin\java"
)
-rem Setup JBoss specific properties
+rem Setup IronJacamar specific properties
rem Setup the java endorsed dirs
-set JBOSS_JCA_ENDORSED_DIRS=%JBOSS_JCA_HOME%\lib\endorsed
+set IRON_JACAMAR_ENDORSED_DIRS=%IRON_JACAMAR_HOME%\lib\endorsed
if "x%JAVA_OPTS%" == "x" (
set "JAVA_OPTS=-Xmx512m"
@@ -49,9 +49,9 @@
echo ===============================================================================
echo.
-echo JBoss JCA
+echo IronJacamar
echo.
-echo JBOSS_JCA_HOME: %JBOSS_HOME%
+echo IRON_JACAMAR_HOME: %IRON_JACAMAR_HOME%
echo.
echo JAVA: %JAVA%
echo.
@@ -62,10 +62,10 @@
:RESTART
"%JAVA%" %JAVA_OPTS% ^
- -Djava.endorsed.dirs="%JBOSS_JCA_ENDORSED_DIRS%" ^
+ -Djava.endorsed.dirs="%IRON_JACAMAR_ENDORSED_DIRS%" ^
-Dorg.jboss.logging.Logger.pluginClass=org.jboss.logging.logmanager.LoggerPluginImpl ^
-Dlog4j.defaultInitOverride=true ^
- -jar jboss-jca-sjc.jar %*
+ -jar ironjacamar-sjc.jar %*
if ERRORLEVEL 10 goto RESTART
Modified: projects/jboss-jca/trunk/sjc/src/main/resources/run.sh
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/run.sh 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/run.sh 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,7 +1,7 @@
#!/bin/sh
### ====================================================================== ###
## ##
-## JBoss JCA Script ##
+## IronJacamar Script ##
## ##
### ====================================================================== ###
@@ -9,15 +9,15 @@
DIRNAME=`dirname $0`
-# Setup JBOSS_JCA_HOME
-if [ "x$JBOSS_JCA_HOME" = "x" ]; then
+# Setup IRON_JACAMAR_HOME
+if [ "x$IRON_JACAMAR_HOME" = "x" ]; then
# get the full path (without any relative bits)
- JBOSS_JCA_HOME=`cd $DIRNAME/..; pwd`
+ IRON_JACAMAR_HOME=`cd $DIRNAME/..; pwd`
fi
-export JBOSS_JCA_HOME
+export IRON_JACAMAR_HOME
# Setup the java endorsed dirs
-JBOSS_JCA_ENDORSED_DIRS="$JBOSS_JCA_HOME/lib/endorsed"
+IRON_JACAMAR_ENDORSED_DIRS="$IRON_JACAMAR_HOME/lib/endorsed"
# Setup the JVM
if [ "x$JAVA" = "x" ]; then
@@ -34,9 +34,9 @@
# Display the environment
echo "========================================================================="
echo ""
-echo " JBoss JCA"
+echo " IronJacamar"
echo ""
-echo " JBOSS_JCA_HOME: $JBOSS_JCA_HOME"
+echo " IRON_JACAMAR_HOME: $IRON_JACAMAR_HOME"
echo ""
echo " JAVA: $JAVA"
echo ""
@@ -45,9 +45,9 @@
echo "========================================================================="
echo ""
-# Start JBoss JCA
+# Start IronJacamar
"$JAVA" $JAVA_OPTS \
- -Djava.endorsed.dirs="$JBOSS_JCA_ENDORSED_DIRS" \
+ -Djava.endorsed.dirs="$IRON_JACAMAR_ENDORSED_DIRS" \
-Dorg.jboss.logging.Logger.pluginClass=org.jboss.logging.logmanager.LoggerPluginImpl \
-Dlog4j.defaultInitOverride=true \
- -jar jboss-jca-sjc.jar "$@"
+ -jar ironjacamar-sjc.jar "$@"
Deleted: projects/jboss-jca/trunk/sjc/src/main/resources/sjc-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/sjc-manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/sjc-manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,5 +0,0 @@
-Main-Class: org.jboss.jca.sjc.Main
-Implementation-Title: JBoss JCA SJC
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
-Implementation-Version: 0.1
Modified: projects/jboss-jca/trunk/sjc/src/main/resources/system/web.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/system/web.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/system/web.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -2,7 +2,7 @@
<!-- Web Server -->
<bean name="WebServer" class="org.jboss.jca.web.WebServer">
- <property name="host">${jboss.jca.bindaddress:localhost}</property>
+ <property name="host">${iron.jacamar.bindaddress:localhost}</property>
<property name="port">8080</property>
<property name="executorService"><inject bean="Kernel" property="ExecutorService"/></property>
</bean>
Modified: projects/jboss-jca/trunk/standalone/build.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/build.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/standalone/build.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project name="jboss-jca-standalone"
+<project name="ironjacamar-standalone"
default="compile"
xmlns:ivy="antlib:org.apache.ivy.ant">
@@ -49,10 +49,16 @@
Target: jars
================================= -->
<target name="jars" depends="compile">
- <jar destfile="${target.dir}/jboss-jca-standalone.jar"
- manifest="src/main/resources/standalone-manifest.mf"
+ <jar destfile="${target.dir}/${name}-standalone.jar"
basedir="${build.standalone.dir}/impl"
- excludes="**/*.java"/>
+ excludes="**/*.java">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Standalone"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ </manifest>
+ </jar>
</target>
<!-- =================================
@@ -67,8 +73,8 @@
docletpathref="standalone.lib.path.id"
author="true"
version="true"
- windowtitle="JBoss JCA Standalone"
- doctitle="JBoss JCA Standalone"
+ windowtitle="IronJacamar Standalone"
+ doctitle="IronJacamar Standalone"
use="true"
additionalparam="-author -version"
classpath="${build.standalone.dir}/impl"
@@ -106,7 +112,7 @@
<copy todir="${target.dir}/standalone/bin">
<fileset dir="${target.dir}">
- <include name="jboss-jca-standalone.jar"/>
+ <include name="${name}-standalone.jar"/>
</fileset>
</copy>
@@ -137,9 +143,9 @@
<copy todir="${target.dir}/standalone/lib">
<fileset dir="${target.dir}">
<include name="*.jar"/>
- <exclude name="jboss-jca-deployers-fungal.jar"/>
- <exclude name="jboss-jca-sjc.jar"/>
- <exclude name="jboss-jca-standalone.jar"/>
+ <exclude name="${name}-deployers-fungal.jar"/>
+ <exclude name="${name}-sjc.jar"/>
+ <exclude name="${name}-standalone.jar"/>
</fileset>
</copy>
Modified: projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/Main.java
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/Main.java 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/Main.java 2010-07-14 20:20:57 UTC (rev 106724)
@@ -68,7 +68,7 @@
{
try
{
- String home = SecurityActions.getSystemProperty("jboss.jca.home");
+ String home = SecurityActions.getSystemProperty("iron.jacamar.home");
File root = null;
if (home != null)
@@ -79,7 +79,7 @@
{
home = new File(".").toURI().toURL().toString();
root = new File(new URI(home.substring(0, home.lastIndexOf("bin"))));
- SecurityActions.setSystemProperty("jboss.jca.home", root.getAbsolutePath());
+ SecurityActions.setSystemProperty("iron.jacamar.home", root.getAbsolutePath());
}
if (args != null && args.length > 0)
@@ -88,7 +88,7 @@
{
if ("-b".equals(args[i]))
{
- SecurityActions.setSystemProperty("jboss.jca.bindaddress", args[++i]);
+ SecurityActions.setSystemProperty("iron.jacamar.bindaddress", args[++i]);
}
}
}
Modified: projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/jca.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/jca.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/jca.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- JBoss JCA
--->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!-- Thread group -->
Modified: projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/naming.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/naming.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/naming.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- JBoss JCA
--->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<classloader><inject bean="naming-classloader:0.0.0"/></classloader>
@@ -42,13 +39,13 @@
<!-- The bootstrap JNP server bind address. This also sets the default
RMI service bind address. Empty == all addresses
-->
- <property name="bindAddress">${jboss.jca.bindaddress:localhost}</property>
+ <property name="bindAddress">${iron.jacamar.bindaddress:localhost}</property>
<!-- The port of the RMI naming service, 0 == anonymous -->
<property name="rmiPort">0</property>
<!-- The RMI service bind address. Empty == all addresses -->
- <property name="rmiBindAddress">${jboss.jca.bindaddress:localhost}</property>
+ <property name="rmiBindAddress">${iron.jacamar.bindaddress:localhost}</property>
<!-- Set the java.rmi.server.hostname system property to rmiBindAddress -->
<property name="enableRmiServerHostname">true</property>
Modified: projects/jboss-jca/trunk/standalone/src/main/resources/logging.properties
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/logging.properties 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/logging.properties 2010-07-14 20:20:57 UTC (rev 106724)
@@ -26,7 +26,7 @@
loggers=org.jboss.jca,org.jboss,org.jnp,com.arjuna
# Root logger level
-logger.level=${jboss.jca.log.level:INFO}
+logger.level=${iron.jacamar.log.level:INFO}
logger.handlers=CONSOLE, FILE
# org.jboss.jca
@@ -44,16 +44,16 @@
# Console handler configuration
handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.jca.log.console.level:INFO}
+handler.CONSOLE.level=${iron.jacamar.log.console.level:INFO}
handler.CONSOLE.autoFlush=true
handler.CONSOLE.formatter=PATTERN
# File handler configuration
handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=${jboss.jca.log.file.level:DEBUG}
+handler.FILE.level=${iron.jacamar.log.file.level:DEBUG}
handler.FILE.properties=autoFlush,fileName
handler.FILE.autoFlush=true
-handler.FILE.fileName=${jboss.jca.home}/server/jca/log/server.log
+handler.FILE.fileName=${iron.jacamar.home}/server/jca/log/server.log
handler.FILE.formatter=PATTERN
# Formatter pattern configuration
Modified: projects/jboss-jca/trunk/standalone/src/main/resources/run.bat
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/run.bat 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/run.bat 2010-07-14 20:20:57 UTC (rev 106724)
@@ -65,7 +65,7 @@
-Djava.endorsed.dirs="%JBOSS_JCA_ENDORSED_DIRS%" ^
-Dorg.jboss.logging.Logger.pluginClass=org.jboss.logging.logmanager.LoggerPluginImpl ^
-Dlog4j.defaultInitOverride=true ^
- -jar jboss-jca-standalone.jar %*
+ -jar ironjacamar-standalone.jar %*
if ERRORLEVEL 10 goto RESTART
Modified: projects/jboss-jca/trunk/standalone/src/main/resources/run.sh
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/run.sh 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/run.sh 2010-07-14 20:20:57 UTC (rev 106724)
@@ -50,4 +50,4 @@
-Djava.endorsed.dirs="$JBOSS_JCA_ENDORSED_DIRS" \
-Dorg.jboss.logging.Logger.pluginClass=org.jboss.logging.logmanager.LoggerPluginImpl \
-Dlog4j.defaultInitOverride=true \
- -jar jboss-jca-standalone.jar "$@"
+ -jar ironjacamar-standalone.jar "$@"
Deleted: projects/jboss-jca/trunk/standalone/src/main/resources/standalone-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/standalone-manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/standalone-manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,5 +0,0 @@
-Main-Class: org.jboss.jca.standalone.Main
-Implementation-Title: JBoss JCA Standalone
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
-Implementation-Version: 0.1
Modified: projects/jboss-jca/trunk/validator/build.xml
===================================================================
--- projects/jboss-jca/trunk/validator/build.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/validator/build.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project name="jboss-jca-validator"
+<project name="ironjacamar-validator"
default="compile"
xmlns:ivy="antlib:org.apache.ivy.ant">
@@ -64,20 +64,38 @@
includes="**/*.properties"/>
</copy>
- <jar destfile="${target.dir}/jboss-jca-validator.jar"
- manifest="src/main/resources/validator-manifest.mf"
+ <jar destfile="${target.dir}/${name}-validator.jar"
basedir="${build.validator.dir}/jars/validator"
- excludes="**/cli/**, **/ant/**"/>
+ excludes="**/cli/**, **/ant/**">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Validator"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ </manifest>
+ </jar>
- <jar destfile="${target.dir}/jboss-jca-validator-cli.jar"
- manifest="src/main/resources/validator-cli-manifest.mf"
+ <jar destfile="${target.dir}/${name}-validator-cli.jar"
basedir="${build.validator.dir}/jars/validator"
- includes="**/cli/**"/>
+ includes="**/cli/**">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Validator Command Line Interface"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ </manifest>
+ </jar>
- <jar destfile="${target.dir}/jboss-jca-validator-ant.jar"
- manifest="src/main/resources/validator-ant-manifest.mf"
+ <jar destfile="${target.dir}/${name}-validator-ant.jar"
basedir="${build.validator.dir}/jars/validator"
- includes="**/ant/**"/>
+ includes="**/ant/**">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Validator Ant support"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ </manifest>
+ </jar>
</target>
<!-- =================================
@@ -92,8 +110,8 @@
docletpathref="standalone.lib.path.id"
author="true"
version="true"
- windowtitle="JBoss JCA validator"
- doctitle="JBoss JCA validator"
+ windowtitle="IronJacamar Validator"
+ doctitle="IronJacamar Validator"
use="true"
additionalparam="-author -version"
classpath="${build.validator.dir}/impl"
Deleted: projects/jboss-jca/trunk/validator/src/main/resources/validator-ant-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/resources/validator-ant-manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/validator/src/main/resources/validator-ant-manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,5 +0,0 @@
-Implementation-Title: JBoss JCA Validator Command Line Tool
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
-Implementation-Version: 0.1
-Class-Path: jboss-jca-validator.jar
Deleted: projects/jboss-jca/trunk/validator/src/main/resources/validator-cli-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/resources/validator-cli-manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/validator/src/main/resources/validator-cli-manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,6 +0,0 @@
-Implementation-Title: JBoss JCA Validator Command Line Tool
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
-Implementation-Version: 0.1
-Main-Class: org.jboss.jca.validator.cli.Main
-Class-Path: jboss-jca-validator.jar
Deleted: projects/jboss-jca/trunk/validator/src/main/resources/validator-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/resources/validator-manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/validator/src/main/resources/validator-manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,5 +0,0 @@
-Implementation-Title: JBoss JCA Validator
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
-Implementation-Version: 0.1
-Class-Path: jbossxb.jar jboss-logging-spi.jar jboss-common-core.jar jboss-metadata-rar.jar jboss-metadata-common.jar jboss-reflect.jar jboss-mdr.jar jboss-jca-spec-api.jar papaki-core.jar javassist.jar jboss-jca-common.jar
\ No newline at end of file
Modified: projects/jboss-jca/trunk/validator/src/main/resources/validator.bat
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/resources/validator.bat 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/validator/src/main/resources/validator.bat 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1 +1 @@
-java -jar jboss-jca-validator-cli.jar %*
+java -jar ironjacamar-validator-cli.jar %*
Modified: projects/jboss-jca/trunk/validator/src/main/resources/validator.sh
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/resources/validator.sh 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/validator/src/main/resources/validator.sh 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,3 +1,3 @@
#!/bin/sh
-java -jar jboss-jca-validator-cli.jar $*
+java -jar ironjacamar-validator-cli.jar $*
Modified: projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/ao/AOTestCase.java
===================================================================
--- projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/ao/AOTestCase.java 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/ao/AOTestCase.java 2010-07-14 20:20:57 UTC (rev 106724)
@@ -216,7 +216,7 @@
{
//given
ResourceAdapterArchive archive = getArchive("ao_property_wrong.rar");
- System.setProperty("jboss.jca.home", ".");
+ System.setProperty("iron.jacamar.home", ".");
File directory = new File("./log");
directory.mkdir();
BufferedReader input = null;
Modified: projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/as/ASTestCase.java
===================================================================
--- projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/as/ASTestCase.java 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/as/ASTestCase.java 2010-07-14 20:20:57 UTC (rev 106724)
@@ -111,7 +111,7 @@
{
//given
ResourceAdapterArchive archive = getArchive("as_property_wrong.rar");
- System.setProperty("jboss.jca.home", ".");
+ System.setProperty("iron.jacamar.home", ".");
File directory = new File("./log");
directory.mkdir();
BufferedReader input = null;
Modified: projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/mcf/MCFTestCase.java
===================================================================
--- projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/mcf/MCFTestCase.java 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/mcf/MCFTestCase.java 2010-07-14 20:20:57 UTC (rev 106724)
@@ -323,7 +323,7 @@
{
//given
ResourceAdapterArchive archive = getArchive("mcf_property_wrong.rar");
- System.setProperty("jboss.jca.home", ".");
+ System.setProperty("iron.jacamar.home", ".");
File directory = new File("./log");
directory.mkdir();
BufferedReader input = null;
Modified: projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/ra/RATestCase.java
===================================================================
--- projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/ra/RATestCase.java 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/validator/src/test/java/org/jboss/jca/validator/rules/ra/RATestCase.java 2010-07-14 20:20:57 UTC (rev 106724)
@@ -373,7 +373,7 @@
{
//given
ResourceAdapterArchive archive = getArchive("ra_property_wrong.rar");
- System.setProperty("jboss.jca.home", ".");
+ System.setProperty("iron.jacamar.home", ".");
File directory = new File("./log");
directory.mkdir();
BufferedReader input = null;
Modified: projects/jboss-jca/trunk/validator/src/test/resources/logging.properties
===================================================================
--- projects/jboss-jca/trunk/validator/src/test/resources/logging.properties 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/validator/src/test/resources/logging.properties 2010-07-14 20:20:57 UTC (rev 106724)
@@ -26,7 +26,7 @@
loggers=org.jboss.jca,org.jboss,org.jnp,com.arjuna
# Root logger level
-logger.level=${jboss.jca.log.level:INFO}
+logger.level=${iron.jacamar.log.level:INFO}
logger.handlers=CONSOLE, FILE
# org.jboss.jca
@@ -44,13 +44,13 @@
# Console handler configuration
handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.jca.log.console.level:INFO}
+handler.CONSOLE.level=${iron.jacamar.log.console.level:INFO}
handler.CONSOLE.autoFlush=true
handler.CONSOLE.formatter=PATTERN
# File handler configuration
handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=${jboss.jca.log.file.level:TRACE}
+handler.FILE.level=${iron.jacamar.log.file.level:TRACE}
handler.FILE.properties=autoFlush,fileName
handler.FILE.autoFlush=true
handler.FILE.fileName=${test.dir}/validator/test.log
Modified: projects/jboss-jca/trunk/web/build.xml
===================================================================
--- projects/jboss-jca/trunk/web/build.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/web/build.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project name="jboss-jca-web"
+<project name="ironjacamar-web"
default="compile"
xmlns:ivy="antlib:org.apache.ivy.ant">
@@ -58,22 +58,34 @@
<fileset dir="src/main/resources"
includes="*.xml"/>
</copy>
- <jar destfile="${target.dir}/jboss-jca-web.jar"
- manifest="src/main/resources/web-manifest.mf"
+ <jar destfile="${target.dir}/${name}-web.jar"
basedir="${build.web.dir}/impl"
- excludes="**/console/**,**/*.java"/>
+ excludes="**/console/**,**/*.java">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Web"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ </manifest>
+ </jar>
- <jar destfile="${target.dir}/jboss-jca-web-console.jar"
- manifest="src/main/resources/console-manifest.mf"
+ <jar destfile="${target.dir}/${name}-web-console.jar"
basedir="${build.web.dir}/impl"
includes="**/console/**"
- excludes="**/*.java"/>
+ excludes="**/*.java">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Web Console"/>
+ <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
+ <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/jca)"/>
+ <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
+ </manifest>
+ </jar>
<war destfile="${target.dir}/console.war"
webxml="src/main/resources/console/WEB-INF/web.xml">
<fileset dir="src/main/resources/console"/>
<lib dir="${target.dir}">
- <include name="jboss-jca-web-console.jar"/>
+ <include name="${name}-web-console.jar"/>
</lib>
<lib dir="${lib.dir}/sjc">
<include name="dom4j.jar"/>
@@ -94,8 +106,8 @@
docletpathref="sjc.lib.path.id"
author="true"
version="true"
- windowtitle="JBoss JCA Web"
- doctitle="JBoss JCA Web"
+ windowtitle="IronJacamar Web"
+ doctitle="IronJacamar Web"
use="true"
additionalparam="-author -version"
classpath="${build.web.dir}/impl"
Modified: projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployer.java
===================================================================
--- projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployer.java 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployer.java 2010-07-14 20:20:57 UTC (rev 106724)
@@ -126,7 +126,7 @@
}
// Setup temporary work directory
- File tmp = new File(SecurityActions.getSystemProperty("jboss.jca.home"), "/tmp/");
+ File tmp = new File(SecurityActions.getSystemProperty("iron.jacamar.home"), "/tmp/");
File tmpDeployment = new File(tmp, "/web" + contextPath);
if (tmpDeployment.exists())
Modified: projects/jboss-jca/trunk/web/src/main/resources/console/WEB-INF/web.xml
===================================================================
--- projects/jboss-jca/trunk/web/src/main/resources/console/WEB-INF/web.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/web/src/main/resources/console/WEB-INF/web.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -4,7 +4,7 @@
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/web-app_2_5.xsd">
- <description>The JBoss JCA Management Console</description>
+ <description>The IronJacamar Management Console</description>
<servlet>
<servlet-name>HtmlAdaptor</servlet-name>
Deleted: projects/jboss-jca/trunk/web/src/main/resources/console-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/web/src/main/resources/console-manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/web/src/main/resources/console-manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,4 +0,0 @@
-Implementation-Title: JBoss JCA Console
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
-Implementation-Version: 0.1
Deleted: projects/jboss-jca/trunk/web/src/main/resources/web-manifest.mf
===================================================================
--- projects/jboss-jca/trunk/web/src/main/resources/web-manifest.mf 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/web/src/main/resources/web-manifest.mf 2010-07-14 20:20:57 UTC (rev 106724)
@@ -1,4 +0,0 @@
-Implementation-Title: JBoss JCA Web
-Implementation-Vendor: Red Hat Middleware LLC
-Implementation-Vendor-Id: org.jboss
-Implementation-Version: 0.1
Modified: projects/jboss-jca/trunk/web/src/main/resources/web.xml
===================================================================
--- projects/jboss-jca/trunk/web/src/main/resources/web.xml 2010-07-14 20:18:38 UTC (rev 106723)
+++ projects/jboss-jca/trunk/web/src/main/resources/web.xml 2010-07-14 20:20:57 UTC (rev 106724)
@@ -2,7 +2,7 @@
<!-- Web Server -->
<bean name="WebServer" class="org.jboss.jca.web.WebServer">
- <property name="host">${jboss.jca.bindaddress:localhost}</property>
+ <property name="host">${iron.jacamar.bindaddress:localhost}</property>
<property name="port">8080</property>
<property name="executorService"><inject bean="Kernel" property="ExecutorService"/></property>
</bean>
More information about the jboss-cvs-commits
mailing list