[jbossws-commits] JBossWS SVN: r13601 - stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3.

[jbossws-commits at lists.jboss.org]

Author: jim.ma
Date: 2011-01-26 05:02:49 -0500 (Wed, 26 Jan 2011)
New Revision: 13601

Removed:
   stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/profiles.xml.example
Modified:
   stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml
   stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/pom.xml
Log:
Remove profiles.xml

Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml	2011-01-26 06:19:49 UTC (rev 13600)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml	2011-01-26 10:02:49 UTC (rev 13601)
@@ -63,10 +63,18 @@
       <isset property="profiles.profile.properties.jboss601.home"/>
     </condition>
 
-    <!-- Loads the properties from the user profile -->
-    <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
-    <property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/>
-    <property name="jboss601.home" value="${profiles.profile.properties.jboss601.home}"/>
+   <fail message="jboss home not set, use jboss601.home=value or jboss600.home=value to set">
+    <condition>
+     <and>
+      <not>
+        <isset property="jboss601.home"/>
+      </not>
+      <not>
+        <isset property="jboss600.home"/>
+      </not>
+     </and>
+    </condition>
+   </fail>
 
     <echo/>
     <echo message="jboss600.home=${jboss600.home}"/>

Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/pom.xml	2011-01-26 06:19:49 UTC (rev 13600)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/pom.xml	2011-01-26 10:02:49 UTC (rev 13601)
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.9.GA</version>
+    <version>1.0.10-SNAPSHOT</version>
   </parent>
   
   <!-- Source Control Management -->

Deleted: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/profiles.xml.example
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/profiles.xml.example	2011-01-26 06:19:49 UTC (rev 13600)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/profiles.xml.example	2011-01-26 10:02:49 UTC (rev 13601)
@@ -1,20 +0,0 @@
-<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd">
-  <profiles>
-
-    <!-- This profile can also be defined in ~/.m2/settings.xml -->
-    <profile>
-      <id>jboss-home-profile</id>
-      <activation>
-        <property>
-          <name>user.name</name>
-        </property>
-      </activation>
-      <properties>
-        <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.Final/build/target/jboss-6.0.0.Final</jboss600.home>
-        <jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.1-SNAPSHOT</jboss601.home>
-      </properties>
-    </profile>
-
-  </profiles>
-</profilesXml>