From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Mon, 23 Mar 2009 19:26:45 +0000 (+0000)
Subject: Ant build script to copy WAR file to JBoss deployment directory now uses the JBOSS_HO... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=fab9d8834c7c674ea90705767f393755f82565ee;p=tmp%2Fjakarta-migration.git

Ant build script to copy WAR file to JBoss deployment directory now uses the JBOSS_HOME environment variable, if a local properties file doesn't set the deployment directory property.
Removed an extraneous schema file after renaming collections/list-type schemas.
---

diff --git a/sandbox/aron/HelloWorld-CollectionObject/HelloWorldService/build.xml b/sandbox/aron/HelloWorld-CollectionObject/HelloWorldService/build.xml
new file mode 100644
index 000000000..87c30a55a
--- /dev/null
+++ b/sandbox/aron/HelloWorld-CollectionObject/HelloWorldService/build.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<project name="helloworld" default="deploy" basedir=".">
+
+  <property file="build.properties" />
+  
+  <target name="deploy" description="Deploy" depends="-set-jboss-dir">
+    <echo>Copying WAR file ...</echo>
+    <copy todir="${jboss.dir}/server/default/deploy">
+      <fileset file="${basedir}/target/helloworld.war" />
+    </copy>
+  </target>
+
+  <!--
+    If the 'jboss.dir' property does not exist - if it has not already
+    been set within a local properties file, as per above - attempt to
+    obtain the value of this property from an environment variable.
+  -->
+  <target name="-set-jboss-dir" description="Set JBoss home directory" unless="${jboss.dir}">
+    <!-- Set the prefix through which to access environment variables -->
+    <property environment="env"/>	
+    <property name="jboss.dir" value="${env.JBOSS_HOME}"/>
+	</target>
+
+</project>
diff --git a/sandbox/aron/schema/collectionObjects.xsd b/sandbox/aron/schema/collectionObjects.xsd
deleted file mode 100644
index a0b5bbf9d..000000000
--- a/sandbox/aron/schema/collectionObjects.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-elementFormDefault="qualified"
-targetNamespace="http://collectionspace.org/hello"
-xmlns="http://collectionspace.org/hello">
-  <xs:element name="collectionObjects">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="collectionObjectListItem"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="collectionObjectListItem">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="collectionSpaceId"/>
-        <xs:element ref="objectNumber"/>
-        <xs:element ref="objectName"/>
-        <xs:element ref="uri"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="collectionSpaceId" type="xs:string"/>
-  <xs:element name="objectNumber">
-    <xs:simpleType>
-      <xs:restriction base="xs:normalizedString">
-        <xs:minLength value="1"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:element>
-  <xs:element name="objectName">
-    <xs:simpleType>
-      <xs:union memberTypes="xs:string">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:length value="0"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:union>
-    </xs:simpleType>
-  </xs:element>
-  <xs:element name="uri" type="xs:anyURI"/>
-</xs:schema>