[jboss-cvs] JBossAS SVN: r105633 - in projects/jboss-jca/trunk: sjc and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 3 06:56:15 EDT 2010
Author: jesper.pedersen
Date: 2010-06-03 06:56:14 -0400 (Thu, 03 Jun 2010)
New Revision: 105633
Added:
projects/jboss-jca/trunk/sjc/src/main/resources/system/
projects/jboss-jca/trunk/sjc/src/main/resources/system/web.xml
Removed:
projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/web.xml
Modified:
projects/jboss-jca/trunk/doc/userguide/en/modules/configuration.xml
projects/jboss-jca/trunk/doc/userguide/en/modules/installation.xml
projects/jboss-jca/trunk/sjc/build.xml
projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap.xml
projects/jboss-jca/trunk/sjc/src/main/resources/logging.properties
projects/jboss-jca/trunk/sjc/src/main/resources/root/index.html
Log:
[JBJCA-342] Deploy Jetty as a system service
Modified: projects/jboss-jca/trunk/doc/userguide/en/modules/configuration.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en/modules/configuration.xml 2010-06-03 09:59:24 UTC (rev 105632)
+++ projects/jboss-jca/trunk/doc/userguide/en/modules/configuration.xml 2010-06-03 10:56:14 UTC (rev 105633)
@@ -157,7 +157,7 @@
<para>The configuration is done in the</para>
<programlisting>
-config/bootstrap/web.xml
+system/web.xml
</programlisting>
<para>file.</para>
@@ -188,14 +188,14 @@
</tgroup>
</table>
- <para>The web server can be removed from the environment by removing the reference to <code>web.xml</code>
- in</para>
+ <para>The web server can be removed from the environment by removing the <code>web.xml</code>
+ file in</para>
<programlisting>
-config/bootstrap.xml
+system/
</programlisting>
- <para>file.</para>
+ <para>Furthermore all .WAR files in the same directory should be removed too.</para>
</section>
Modified: projects/jboss-jca/trunk/doc/userguide/en/modules/installation.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en/modules/installation.xml 2010-06-03 09:59:24 UTC (rev 105632)
+++ projects/jboss-jca/trunk/doc/userguide/en/modules/installation.xml 2010-06-03 10:56:14 UTC (rev 105633)
@@ -65,6 +65,9 @@
log: Contains the log files for the container.
</listitem>
<listitem>
+ system: Contains system deployments.
+ </listitem>
+ <listitem>
tmp: Contains temporary files.
</listitem>
</itemizedlist>
Modified: projects/jboss-jca/trunk/sjc/build.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/build.xml 2010-06-03 09:59:24 UTC (rev 105632)
+++ projects/jboss-jca/trunk/sjc/build.xml 2010-06-03 10:56:14 UTC (rev 105633)
@@ -99,6 +99,7 @@
<mkdir dir="${target.dir}/sjc/lib/endorsed"/>
<mkdir dir="${target.dir}/sjc/log"/>
<mkdir dir="${target.dir}/sjc/deploy"/>
+ <mkdir dir="${target.dir}/sjc/system"/>
<copy todir="${target.dir}/sjc/bin">
<fileset dir="src/main/resources/">
@@ -135,6 +136,12 @@
</fileset>
</copy>
+ <copy todir="${target.dir}/sjc/system">
+ <fileset dir="src/main/resources/system">
+ <include name="*.xml"/>
+ </fileset>
+ </copy>
+
<copy todir="${target.dir}/sjc/lib">
<fileset dir="${target.dir}">
<include name="*.jar"/>
@@ -169,7 +176,7 @@
</fileset>
</copy>
- <copy todir="${target.dir}/sjc/deploy">
+ <copy todir="${target.dir}/sjc/system">
<fileset dir="${target.dir}">
<include name="*.war"/>
</fileset>
@@ -236,7 +243,7 @@
<delete dir="${build.dir}/en"/>
- <copy todir="${target.dir}/sjc/deploy">
+ <copy todir="${target.dir}/sjc/system">
<fileset dir="${target.dir}">
<include name="*.war"/>
</fileset>
Deleted: projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/web.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/web.xml 2010-06-03 09:59:24 UTC (rev 105632)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/web.xml 2010-06-03 10:56:14 UTC (rev 105633)
@@ -1,16 +0,0 @@
-<deployment>
-
- <!-- Web Server -->
- <bean name="WebServer" class="org.jboss.jca.web.WebServer">
- <property name="host">${jboss.jca.bindaddress:localhost}</property>
- <property name="port">8080</property>
- <property name="executorService"><inject bean="Kernel" property="ExecutorService"/></property>
- </bean>
-
- <!-- WAR deployer -->
- <bean name="WARDeployer" class="org.jboss.jca.web.WARDeployer">
- <property name="server"><inject bean="WebServer" property="Server"/></property>
- <depends>WebServer</depends>
- </bean>
-
-</deployment>
Modified: projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap.xml 2010-06-03 09:59:24 UTC (rev 105632)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap.xml 2010-06-03 10:56:14 UTC (rev 105633)
@@ -4,6 +4,5 @@
<url>bootstrap/stdio.xml</url>
<url>bootstrap/transaction.xml</url>
<url>bootstrap/jca.xml</url>
- <url>bootstrap/web.xml</url>
</bootstrap>
Modified: projects/jboss-jca/trunk/sjc/src/main/resources/logging.properties
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/logging.properties 2010-06-03 09:59:24 UTC (rev 105632)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/logging.properties 2010-06-03 10:56:14 UTC (rev 105633)
@@ -39,7 +39,7 @@
logger.org.jnp.level=INFO
# com.arjuna
-logger.com.arjuna.level=INFO
+logger.com.arjuna.level=WARN
# org.mortbay
logger.org.mortbay.level=WARN
Modified: projects/jboss-jca/trunk/sjc/src/main/resources/root/index.html
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/root/index.html 2010-06-03 09:59:24 UTC (rev 105632)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/root/index.html 2010-06-03 10:56:14 UTC (rev 105633)
@@ -27,8 +27,8 @@
<li><a href="http://www.jboss.org/jca/downloads.html" target="_blank">Download</a></li>
<li><a href="http://www.jboss.org/jca/community.html" target="_blank">Community</a></li>
<li><a href="http://www.jboss.org/jca/issues.html" target="_blank">Issue Tracker</a></li>
- <li><a href="http://jboss.org/jca/sourcecode.html" target="_blank">Source Code</a></li>
- <li><a href="http://jboss.org/jca/build.html" target="_blank">Build</a></li>
+ <li><a href="http://www.jboss.org/jca/sourcecode.html" target="_blank">Source Code</a></li>
+ <li><a href="http://www.jboss.org/jca/build.html" target="_blank">Build</a></li>
</ul>
<p/>
@@ -36,7 +36,7 @@
<table width="100%" class="copyright">
<tr>
<td class="copyright">
- Copyright © 2009 <a href="http://www.jboss.org/jca" target="_blank">JBoss, by Red Hat</a>
+ Copyright © 2010 <a href="http://www.jboss.org/jca" target="_blank">JBoss, by Red Hat</a>
</td>
</tr>
</table>
Copied: projects/jboss-jca/trunk/sjc/src/main/resources/system/web.xml (from rev 105632, projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/web.xml)
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/system/web.xml (rev 0)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/system/web.xml 2010-06-03 10:56:14 UTC (rev 105633)
@@ -0,0 +1,16 @@
+<deployment>
+
+ <!-- Web Server -->
+ <bean name="WebServer" class="org.jboss.jca.web.WebServer">
+ <property name="host">${jboss.jca.bindaddress:localhost}</property>
+ <property name="port">8080</property>
+ <property name="executorService"><inject bean="Kernel" property="ExecutorService"/></property>
+ </bean>
+
+ <!-- WAR deployer -->
+ <bean name="WARDeployer" class="org.jboss.jca.web.WARDeployer">
+ <property name="server"><inject bean="WebServer" property="Server"/></property>
+ <depends>WebServer</depends>
+ </bean>
+
+</deployment>
More information about the jboss-cvs-commits
mailing list