donaldp 01/11/10 13:43:02
Modified: apps/bay build.xml
apps/bay/src/conf avalon-bay-assembly.xml
apps/demo/src/conf avalon-demo-environment.xml
avalon-gluedemo-environment.xml
apps/ftpserver build.xml
apps/hsql build.xml
apps/jesktop build.xml
Added: apps/bay/src/conf avalon-bay-environment.xml
apps/ftpserver/src/conf ftp-environment.xml
apps/hsql/src/conf avalon-hsql-environment.xml
apps/jesktop/src/conf jesktop-environment.xml
Removed: apps/bay/src/conf avalon-bay-server.xml keystore
apps/ftpserver/src/conf ftp-server.xml
apps/hsql/src/conf avalon-hsql-server.xml keystore
apps/jesktop/src/conf jesktop-server.xml
Log:
Update applications to use environment.xml rather than server.xml
Revision Changes Path
1.11 +1 -5 jakarta-avalon-cornerstone/apps/bay/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/bay/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 2001/11/02 12:26:16 1.10
+++ build.xml 2001/11/10 21:43:02 1.11
@@ -116,7 +116,7 @@
<sar sarfile="${build.lib}/avalon-bay.sar"
config="${conf.dir}/avalon-bay-config.xml"
- server="${conf.dir}/avalon-bay-server.xml"
+ environment="${conf.dir}/avalon-bay-environment.xml"
assembly="${conf.dir}/avalon-bay-assembly.xml" >
<lib dir="${build.lib}/">
@@ -128,10 +128,6 @@
</lib>
-->
- <zipfileset dir="${conf.dir}" fullpath="conf/keyStore">
- <include name="keystore"/>
- </zipfileset>
-
<zipfileset dir="jakarta-tomcat-4.0" prefix="jakarta-tomcat-4.0">
<include name="**"/>
</zipfileset>
1.2 +0 -3
jakarta-avalon-cornerstone/apps/bay/src/conf/avalon-bay-assembly.xml
Index: avalon-bay-assembly.xml
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/bay/src/conf/avalon-bay-assembly.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avalon-bay-assembly.xml 2001/09/16 22:41:58 1.1
+++ avalon-bay-assembly.xml 2001/11/10 21:43:02 1.2
@@ -1,10 +1,7 @@
<?xml version="1.0"?>
<assembly>
-
<block class="org.apache.avalon.bay.blocks.TomcatExamples"
name="http-server" >
</block>
-
-
</assembly>
1.1
jakarta-avalon-cornerstone/apps/bay/src/conf/avalon-bay-environment.xml
Index: avalon-bay-environment.xml
===================================================================
<?xml version="1.0"?>
<!--
README!
Basic config file that sets up context for server application.
-->
<environment>
<logs>
<category name="" target="default" priority="DEBUG" />
<category name="objectstorage" target="objectstorage-target"
priority="DEBUG" />
<log-target name="default" location="/logs/avalon-demo.log" />
<log-target name="objectstorage-target"
location="/logs/objectstorage.log" />
</logs>
<policy>
<grant code-base="file:${app.home}${/}SAR-INF${/}lib${/}*">
<permission class="java.security.AllPermission" />
</grant>
</policy>
</environment>
1.2 +2 -2
jakarta-avalon-cornerstone/apps/demo/src/conf/avalon-demo-environment.xml
Index: avalon-demo-environment.xml
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/demo/src/conf/avalon-demo-environment.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avalon-demo-environment.xml 2001/11/10 20:35:57 1.1
+++ avalon-demo-environment.xml 2001/11/10 21:43:02 1.2
@@ -5,7 +5,7 @@
Basic config file that sets up context for server application.
-->
-<server>
+<environment>
<logs>
<category name="" target="default" priority="DEBUG" />
@@ -29,4 +29,4 @@
</grant>
</policy>
-</server>
+</environment>
1.2 +2 -2
jakarta-avalon-cornerstone/apps/demo/src/conf/avalon-gluedemo-environment.xml
Index: avalon-gluedemo-environment.xml
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/demo/src/conf/avalon-gluedemo-environment.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avalon-gluedemo-environment.xml 2001/11/10 20:35:57 1.1
+++ avalon-gluedemo-environment.xml 2001/11/10 21:43:02 1.2
@@ -5,7 +5,7 @@
Basic config file that sets up context for server application.
-->
-<server>
+<environment>
<logs>
@@ -23,4 +23,4 @@
</grant>
</policy>
-</server>
+</environment>
1.20 +2 -7 jakarta-avalon-cornerstone/apps/ftpserver/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/ftpserver/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.xml 2001/10/27 14:08:17 1.19
+++ build.xml 2001/11/10 21:43:02 1.20
@@ -235,18 +235,13 @@
<include name="ftp-assembly.xml"/>
</zipfileset>
- <zipfileset dir="${conf.dir}" fullpath="SAR-INF/server.xml">
- <include name="${jar.name}.xml"/>
+ <zipfileset dir="${conf.dir}" fullpath="SAR-INF/environment.xml">
+ <include name="ftp-environment.xml"/>
</zipfileset>
<zipfileset dir="${conf.dir}" fullpath="SAR-INF/config.xml">
<include name="ftp-config.xml"/>
</zipfileset>
-
- <zipfileset dir="${conf.dir}" fullpath="conf/keyStore">
- <include name="keystore"/>
- </zipfileset>
-
</jar>
<mkdir dir="dist"/>
1.1
jakarta-avalon-cornerstone/apps/ftpserver/src/conf/ftp-environment.xml
Index: ftp-environment.xml
===================================================================
<?xml version="1.0"?>
<!--
README!
Basic config file that sets up context for server application.
-->
<environment>
<logs>
<category name="" target="default" priority="DEBUG" />
<category name="ftp-server" target="default" priority="DEBUG" />
<log-target name="default" location="/logs/server-ftp.log" />
</logs>
<policy>
<grant code-base="file:${app.home}${/}SAR-INF${/}lib${/}*">
<permission class="java.security.AllPermission" />
</grant>
</policy>
</environment>
1.4 +1 -5 jakarta-avalon-cornerstone/apps/hsql/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/hsql/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 2001/10/28 12:11:50 1.3
+++ build.xml 2001/11/10 21:43:02 1.4
@@ -113,7 +113,7 @@
<sar sarfile="${build.lib}/avalon-hsql.sar"
config="${conf.dir}/avalon-hsql-config.xml"
- server="${conf.dir}/avalon-hsql-server.xml"
+ environment="${conf.dir}/avalon-hsql-environment.xml"
assembly="${conf.dir}/avalon-hsql-assembly.xml" >
<lib dir="${build.lib}/">
@@ -127,10 +127,6 @@
<lib dir="../../build/lib">
<include name="cornerstone.jar"/>
</lib>
-
- <zipfileset dir="${conf.dir}" fullpath="conf/keyStore">
- <include name="keystore"/>
- </zipfileset>
</sar>
1.1
jakarta-avalon-cornerstone/apps/hsql/src/conf/avalon-hsql-environment.xml
Index: avalon-hsql-environment.xml
===================================================================
<?xml version="1.0"?>
<!--
README!
Basic config file that sets up context for server application.
-->
<environment>
<logs>
<category name="" target="default" priority="DEBUG" />
<category name="objectstorage" target="objectstorage-target"
priority="DEBUG" />
<log-target name="default" location="/logs/avalon-demo.log" />
<log-target name="objectstorage-target"
location="/logs/objectstorage.log" />
</logs>
<policy>
<grant code-base="file:${app.home}${/}SAR-INF${/}lib${/}*">
<permission class="java.security.AllPermission" />
</grant>
</policy>
</environment>
1.15 +2 -2 jakarta-avalon-cornerstone/apps/jesktop/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/jesktop/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 2001/11/06 11:08:36 1.14
+++ build.xml 2001/11/10 21:43:02 1.15
@@ -256,8 +256,8 @@
<include name="jesktop-assembly.xml"/>
</zipfileset>
- <zipfileset dir="${conf.dir}" fullpath="SAR-INF/server.xml">
- <include name="jesktop-server.xml"/>
+ <zipfileset dir="${conf.dir}" fullpath="SAR-INF/environment.xml">
+ <include name="jesktop-environment.xml"/>
</zipfileset>
<zipfileset dir="${conf.dir}" fullpath="SAR-INF/config.xml">
1.1
jakarta-avalon-cornerstone/apps/jesktop/src/conf/jesktop-environment.xml
Index: jesktop-environment.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
README!
Basic config file that sets up context for server application.
-->
<environment>
<logs>
<category name="" target="default" priority="DEBUG" />
<category name="objectstorage" target="objectstorage-target"
priority="DEBUG" />
<category name="jesktop-kernel" target="jesktop-kernel-target"
priority="DEBUG" />
<category name="jesktop-windowmanager"
target="jesktop-windowmanager-target" priority="DEBUG" />
<log-target name="default" location="/logs/jesktop-default.log" />
<log-target name="jesktop-kernel-target"
location="/logs/jesktop-kernel.log" />
<log-target name="jesktop-windowmanager-target"
location="/logs/jesktop-windowmanager.log" />
<log-target name="objectstorage-target"
location="/logs/objectstorage.log" />
</logs>
<policy>
<grant code-base="file:${app.home}${/}SAR-INF${/}lib${/}*">
<permission class="java.security.AllPermission" />
</grant>
</policy>
</environment>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
