[jbossws-commits] JBossWS SVN: r6753 - in stack/native/trunk/src/main: java/org/jboss/ws/tools/ant and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2008-04-29 10:47:50 -0400 (Tue, 29 Apr 2008)
New Revision: 6753

Removed:
   stack/native/trunk/src/main/distro/eclipse.project
   stack/native/trunk/src/main/java/org/jboss/ws/tools/ant/FixPathTask.java
Modified:
   stack/native/trunk/src/main/distro/bin-dist-project-gen.xml
Log:
Moving Ant FixPathTask to common + using it in the project generator build


Modified: stack/native/trunk/src/main/distro/bin-dist-project-gen.xml
===================================================================
--- stack/native/trunk/src/main/distro/bin-dist-project-gen.xml	2008-04-29 14:29:10 UTC (rev 6752)
+++ stack/native/trunk/src/main/distro/bin-dist-project-gen.xml	2008-04-29 14:47:50 UTC (rev 6753)
@@ -24,11 +24,11 @@
    	</filterset>
   	
   	<path id="jbws-ant.path">
-  		<pathelement location="${thirdparty.dir}/jbossws-core.jar" />
   		<pathelement location="${thirdparty.dir}/jbossws-common.jar" />
   	</path>
   	<taskdef name="pathFixer" classname="org.jboss.ws.tools.ant.FixPathTask" classpathref="jbws-ant.path"/>
   	<taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="jbws-ant.path"/>
+  	<taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="jbws-ant.path"/>
   	<taskdef name="pathWriter" classname="org.jboss.ws.tools.ant.PathWriterTask" classpathref="jbws-ant.path"/>
   </target>
 
@@ -106,9 +106,6 @@
     <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml">
       <filterset refid="project"/>
     </copy>
-    <copy tofile="${project.home}/.project" file="${basedir}/build/eclipse.project">
-      <filterset refid="project"/>
-    </copy>
     <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/>
   	<path id="project.classpath">
 		<path refid="integration.target.javac.classpath" />
@@ -120,6 +117,7 @@
         <pathelement location="${jboss.client}/jbossws-client.jar"/>
 	</path>
   	<eclipseClasspathGenerator pathId="project.classpath" outputFile="${project.home}/.classpath" srcPath="src/main/java" srcOutput="bin/main" />
+  	<eclipseProjectGenerator projectName="${project.name}" outputFile="${project.home}/.project" />
   	<pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" />
   </target>
   

Deleted: stack/native/trunk/src/main/distro/eclipse.project
===================================================================
--- stack/native/trunk/src/main/distro/eclipse.project	2008-04-29 14:29:10 UTC (rev 6752)
+++ stack/native/trunk/src/main/distro/eclipse.project	2008-04-29 14:47:50 UTC (rev 6753)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>@projectName@</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

Deleted: stack/native/trunk/src/main/java/org/jboss/ws/tools/ant/FixPathTask.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/ant/FixPathTask.java	2008-04-29 14:29:10 UTC (rev 6752)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/ant/FixPathTask.java	2008-04-29 14:47:50 UTC (rev 6753)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ws.tools.ant;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-public class FixPathTask extends Task
-{
-   private String propertyName;
-
-   @Override
-   public void execute() throws BuildException
-   {
-      String path = getProject().getProperty(propertyName);
-
-      if (path != null)
-      {
-         getProject().setProperty(propertyName, path.replace('\\', '/'));
-      }
-   }
-
-   public void setProperty(String propertyName)
-   {
-      this.propertyName = propertyName;
-   }
-}