You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@avalon.apache.org by do...@apache.org on 2001/11/10 22:21:43 UTC
cvs commit: jakarta-avalon-phoenix/src/pdk/src/conf pd-environment.xml keystore pd-server.xml
donaldp 01/11/10 13:21:43
Modified: . build.xml
src/pdk build.xml
Added: src/pdk/src/conf pd-environment.xml
Removed: src/pdk/src/conf keystore pd-server.xml
Log:
Update so that pdk uses latest Phoenix layout.
Revision Changes Path
1.73 +2 -2 jakarta-avalon-phoenix/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/build.xml,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- build.xml 2001/11/10 10:32:10 1.72
+++ build.xml 2001/11/10 21:21:42 1.73
@@ -593,10 +593,10 @@
</target>
<!-- Makes the Phoneix Development Kit -->
- <target name="make-pdk" depends="rmic" description="Generates a dual mode example Phoenix application">
+ <target name="make-pdk" depends="jars" description="Generates thd PDK distribution">
<mkdir dir="${dist.base}"/>
- <zip file="${dist.base}/phoenix-devkit.zip">
+ <zip file="${dist.base}/phoenix-developers-kit.zip">
<fileset dir="src/pdk">
<include name="**"/>
</fileset>
1.5 +4 -11 jakarta-avalon-phoenix/src/pdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/pdk/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 2001/11/09 22:31:59 1.4
+++ build.xml 2001/11/10 21:21:43 1.5
@@ -29,16 +29,15 @@
<available file="../../lib/README" property="wrong-place"/>
</target>
- <target name="warning" if="wrong-place">
+ <target name="warning" depends="test" if="wrong-place">
<echo>This sub project is not intended to be built in situ.</echo>
<echo>It is supposed to be self contained and part of a separate PDK distribution</echo>
<echo>Run the make-pdk target in the Phoenix project to make the PDK</echo>
<fail>Build aborted.</fail>
</target>
-
<!-- Compiles project -->
- <target name="compile" depends="test,warning">
+ <target name="compile" depends="warning">
<mkdir dir="build/classes"/>
@@ -48,7 +47,6 @@
optimize="${build.optimize}"
deprecation="${build.deprecation}">
<classpath refid="project.class.path" />
-
</javac>
</target>
@@ -58,7 +56,6 @@
<mkdir dir="build/lib"/>
-
<!-- block for Phoenix-Demo -->
<jar jarfile="build/lib/phoenix-demo-block.jar"
manifest="src/manifest/block-archive.mf">
@@ -104,16 +101,12 @@
<include name="*block.jar"/>
</zipfileset>
- <zipfileset dir="src/conf" fullpath="conf/keyStore">
- <include name="keystore"/>
- </zipfileset>
-
<zipfileset dir="src/conf" fullpath="SAR-INF/assembly.xml">
<include name="pd-assembly.xml"/>
</zipfileset>
- <zipfileset dir="src/conf" fullpath="SAR-INF/server.xml">
- <include name="pd-server.xml"/>
+ <zipfileset dir="src/conf" fullpath="SAR-INF/environment.xml">
+ <include name="pd-environment.xml"/>
</zipfileset>
<zipfileset dir="src/conf" fullpath="SAR-INF/config.xml">
1.1 jakarta-avalon-phoenix/src/pdk/src/conf/pd-environment.xml
Index: pd-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>
<!--
<keystore name="foo-keystore"
location="file:${app.home}${/}conf${/}keystore"
type="JKS" />
<grant signed-by="Fred" code-base="file:${app.home}/blocks/*" key-store="foo-keystore">
<permission class="java.io.FilePermission" target="/tmp/*" action="read,write" />
</grant>
-->
<grant code-base="file:${app.home}${/}blocks${/}*">
<permission class="java.security.AllPermission" />
</grant>
<grant code-base="file:${app.home}${/}lib${/}*">
<permission class="java.security.AllPermission" />
</grant>
</policy>
</environment>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>