[jboss-cvs] JBossAS SVN: r70430 - in projects/security/security-negotiation/trunk: SimpleWebApplication and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: darran.lofthouse at jboss.com
Date: 2008-03-05 10:29:17 -0500 (Wed, 05 Mar 2008)
New Revision: 70430

Added:
   projects/security/security-negotiation/trunk/ant.properties.example
Modified:
   projects/security/security-negotiation/trunk/
   projects/security/security-negotiation/trunk/SimpleWebApplication/
   projects/security/security-negotiation/trunk/SimpleWebApplication/build.xml
   projects/security/security-negotiation/trunk/spnego-configuration/build.xml
Log:
Use ant.properties for JBoss location.


Property changes on: projects/security/security-negotiation/trunk
___________________________________________________________________
Name: svn:ignore
   - .metadata

   + .metadata
ant.properties



Property changes on: projects/security/security-negotiation/trunk/SimpleWebApplication
___________________________________________________________________
Name: svn:ignore
   + bin
build


Modified: projects/security/security-negotiation/trunk/SimpleWebApplication/build.xml
===================================================================
--- projects/security/security-negotiation/trunk/SimpleWebApplication/build.xml	2008-03-05 15:16:22 UTC (rev 70429)
+++ projects/security/security-negotiation/trunk/SimpleWebApplication/build.xml	2008-03-05 15:29:17 UTC (rev 70430)
@@ -1,7 +1,14 @@
 <project name="Calculator" default="deploy" basedir=".">
 
-  <property file="${basedir}/../local.properties" />
+  <available property="ant.properties.available" file="${basedir}/../ant.properties" />
+  <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available" />
+  <property file="${basedir}/../ant.properties" />
 
+  <fail message="jboss.home not set, check ant.properties" unless="jboss.home" />
+  
+  <property name="jboss.configuration" value="default" />
+  <property name="jboss.server.dir" location="${jboss.home}/server/${jboss.configuration}" />
+
   <property name="src.dir" location="${basedir}/src" />
   <property name="descriptors.dir" location="${basedir}/descriptors" />
   <property name="lib.dir" location="${basedir}/lib" />
@@ -12,9 +19,6 @@
   <property name="build.deliverables.dir" location="${build.dir}/deliverables" />
   <property name="build.descriptors.dir" location="${build.dir}/descriptors" />
 
-  <property name="jboss.home" location="/home/darranl/src/links/JBoss_Current" />
-  <property name="jboss.server.dir" location="${jboss.home}/server/default" />
-
   <path id="project.classpath">
     <fileset dir="${jboss.home}">
       <include name="client/jbossall-client.jar" />

Added: projects/security/security-negotiation/trunk/ant.properties.example
===================================================================
--- projects/security/security-negotiation/trunk/ant.properties.example	                        (rev 0)
+++ projects/security/security-negotiation/trunk/ant.properties.example	2008-03-05 15:29:17 UTC (rev 70430)
@@ -0,0 +1,6 @@
+
+# Copy this file to ant.properties and set the values below as
+# is required on your workstation.
+
+jboss.home=/home/user/jboss-4.2.2.GA
+#jboss.configuration=default
\ No newline at end of file

Modified: projects/security/security-negotiation/trunk/spnego-configuration/build.xml
===================================================================
--- projects/security/security-negotiation/trunk/spnego-configuration/build.xml	2008-03-05 15:16:22 UTC (rev 70429)
+++ projects/security/security-negotiation/trunk/spnego-configuration/build.xml	2008-03-05 15:29:17 UTC (rev 70430)
@@ -4,6 +4,15 @@
 
 <project name="LoginConfiguration" default="deploy" basedir=".">
 
+  <available property="ant.properties.available" file="${basedir}/../ant.properties" />
+  <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available" />
+  <property file="${basedir}/../ant.properties" />
+
+  <fail message="jboss.home not set, check ant.properties" unless="jboss.home" />
+  
+  <property name="jboss.configuration" value="default" />
+  <property name="jboss.server.dir" location="${jboss.home}/server/${jboss.configuration}" />  
+  
   <property name="src.dir" location="${basedir}/src" />
   <property name="descriptors.dir" location="${basedir}/descriptors" />
   <property name="lib.dir" location="${basedir}/lib" />
@@ -12,9 +21,6 @@
   <property name="build.classes.dir" location="${build.dir}/classes" />
   <property name="build.deliverables.dir" location="${build.dir}/deliverables" />
 
-  <property name="jboss.home" location="/home/darranl/src/links/JBoss_Current" />
-  <property name="jboss.server.dir" location="${jboss.home}/server/default" />
-
   <path id="project.classpath">
     <fileset dir="${jboss.home}">
       <include name="client/jbossall-client.jar" />