Revision 41074

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.mkmvnproject.app/org.gvsig.mkmvnproject.app.mainplugin/src/main/resources-plugin/scripts/fortunecookies.xml
93 93
				<echo>Unzipping the basic template project</echo>
94 94
				<unzip src="${templates.folder}/fortunecookies-basic.zip" dest="${project.folder}" />
95 95
			</then>
96
			<!--
96 97
			<else>
97 98
				<echo>Unzipping the provider based implementation template project</echo>
98 99
				<unzip src="${templates.folder}/fortunecookies-pbi.zip" dest="${project.folder}" />
99 100
			</else>
101
			-->
100 102
		</if>
101 103

  
102 104
		<!-- Calculate the project artifact id as PATH -->
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.mkmvnproject.app/org.gvsig.mkmvnproject.app.mainplugin/src/main/resources-plugin/scripts/mkmvnproject.xml
67 67
	<property name="template.fortunecookies-basic.description2" value="structure. It has no GEO logic and is based on a basic" />
68 68
	<property name="template.fortunecookies-basic.description3" value="API/implementation separation" />
69 69

  
70
	<!--
70 71
    <property name="template.fortunecookies-provider.option" value="3 - General project based on Fortune cookies example project" />
71 72
    <property name="template.fortunecookies-provider.description1" value="Create a general pourpose project with the multimodule" />
72 73
    <property name="template.fortunecookies-provider.description2" value="structure. It has no GEO logic and is based on" />
73 74
    <property name="template.fortunecookies-provider.description3" value="API/SPI/implementation separation and providers"  />
74

  
75
	-->
75 76
	<property name="template.landregistryviewer.option" value="1 - Basic plugin with spatial support" />
76 77
	<property name="template.landregistryviewer.description1" value="Create a project based in the LandRegistryViewer example." />
77 78
	<property name="template.landregistryviewer.description2" value="Uses access to View, MapControl and datasources." />
78 79
	<property name="template.landregistryviewer.description3" value="" />
79 80

  
81
	<!--
80 82
	<property name="templates" value="fortunecookies-basic,fortunecookies-provider,landregistryviewer" />
83
	-->
84
	<property name="templates" value="fortunecookies-basic,landregistryviewer" />
81 85
	<!-- 
82 86
	================ End specific code of templates ================= 
83 87
	-->
......
109 113
                                         ${template.landregistryviewer.description2}
110 114
                                         ${template.landregistryviewer.description3}</label>
111 115

  
112
			<checkSelectionProperty editable="false" property="template.fortunecookies-basic.check" values="${template.fortunecookies-basic.option}" label="" />
116
			<checkSelectionProperty editable="true" property="template.fortunecookies-basic.check" values="${template.fortunecookies-basic.option}" label="" />
113 117
			<label>                                         ${template.fortunecookies-basic.description1}
114 118
                                         ${template.fortunecookies-basic.description2}
115 119
                                         ${template.fortunecookies-basic.description3}</label>
120
			<!--
116 121
            <checkSelectionProperty editable="false" property="template.fortunecookies-provider.check" values="${template.fortunecookies-provider.option}" label="" />
117 122
            <label>                                         ${template.fortunecookies-provider.description1}
118 123
                                         ${template.fortunecookies-provider.description2}
119 124
                                         ${template.fortunecookies-provider.description3}</label>
125
            -->
120 126
			<!-- 
121 127
			================ End specific code of templates ================= 
122 128
			-->
......
243 249
	</target>
244 250

  
245 251
	<target name="mkproject-prepare-workspace">
252
	  <!--
246 253
		<ant dir="${project.folder}/${project.artifact.id}" antfile="prepare-workspace.xml" target="prepare-workspace" />
247 254
		<if>
248 255
			<resourceexists>
......
252 259
				<ant dir="${project.folder}/${project.artifact.id}.app" antfile="../org.gvsig.maven.base.build/maven-goals.xml" target="mvn-install-and-eclipse-eclipse" />
253 260
			</then>
254 261
		</if>
262
		-->
255 263
	</target>
256 264

  
257 265
	<target name="mkproject-build-succesfully">
......
280 288
		<fail message="${message}" />
281 289
	</target>
282 290

  
283
</project>
291
</project>
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.mkmvnproject.app/org.gvsig.mkmvnproject.app.mainplugin/src/main/assembly/gvsig-plugin-package.xml
45 45
      <directory>src/main/resources-plugin</directory>
46 46
      <outputDirectory>.</outputDirectory>
47 47
    </fileSet>
48
    <fileSet>
49
      <directory>target/templates-zips</directory>
50
      <outputDirectory>templates</outputDirectory>
51
    </fileSet>
48 52
  </fileSets>
49

  
53
  
50 54
  <dependencySets>
51 55
    <dependencySet>
52 56
      <useProjectArtifact>false</useProjectArtifact>
......
60 64
        <include>org.apache.ant:ant-apache-oro</include>
61 65
        <include>com.sardak:antform</include>
62 66
        <include>org.tigris.antelope:antelopetasks</include>	
67
        <include>org.apache.maven:maven-ant-tasks</include>
63 68
      </includes>
64 69
    </dependencySet>
65 70
  </dependencySets>
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.mkmvnproject.app/org.gvsig.mkmvnproject.app.mainplugin/src/main/java/org/gvsig/mkmvnproject/MakeMavenProjectExtension.java
80 80
	    }
81 81
	    */
82 82

  
83
	    if (!checkPlatformProperties()) {
84
	        return;
85
	    }
83
//	    if (!checkPlatformProperties()) {
84
//	        return;
85
//	    }
86 86
	    
87 87
        // ==========================================================
88 88
		// TODO: add support to parallel executions in Andami??
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.mkmvnproject.app/org.gvsig.mkmvnproject.app.mainplugin/src/main/java/org/gvsig/mkmvnproject/gui/CreatePluginConsolePanel.java
199 199
				logger.debug("Console input stream end, finish reading");
200 200
				reader.close();
201 201
			} catch (IOException e) {
202
			    logger.warn("Error reading from the console string", e);
202
			    logger.info("Write end dead.");
203 203
			}
204 204
		}
205 205

  
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.mkmvnproject.app/org.gvsig.mkmvnproject.app.mainplugin/src/main/ant/prepare-templates.xml
57 57
            <arg value="export" />
58 58
            <arg value="https://devel.gvsig.org/svn/gvsig-plugintemplates/org.gvsig.fortunecookies/trunk/basic-with-user-interface" />
59 59
        </java>
60
    	<!--
60 61
        <java classname="org.tmatesoft.svn.cli.SVN"
61 62
              classpath="${runtime_classpath}"
62 63
              dir="${target}/templates/downloads/fortunecookies/"
63 64
              fork="true"
64 65
              failonerror="true">
65
        	<arg value="--non-interactive"/>
66
        	<arg value="- - non-interactive"/> Ojo, que el "- -" va junto.
66 67
            <arg value="export" />
67 68
            <arg value="https://devel.gvsig.org/svn/gvsig-plugintemplates/org.gvsig.fortunecookies/trunk/provider-based-implementation-with-user-interface" />
68 69
        </java>
70
        -->
69 71
    </target>
70 72

  
71 73
    <target name="prepare-fortunecookies" depends="download-fortunecookies">
......
75 77
        <zip destfile="${target}/templates-zips/fortunecookies-basic.zip"
76 78
             basedir="${target}/templates/downloads/fortunecookies/basic-with-user-interface/"
77 79
             includes="**/*" />
80
    	<!--
78 81
        <zip destfile="${target}/templates-zips/fortunecookies-pbi.zip"
79 82
             basedir="${target}/templates/downloads/fortunecookies/provider-based-implementation-with-user-interface/"
80 83
             includes="**/*" />
84
        -->
81 85
    </target>
82 86

  
83 87
	
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.mkmvnproject.app/org.gvsig.mkmvnproject.app.mainplugin/pom.xml
16 16

  
17 17
  <dependencies>
18 18
    <dependency>
19
	  <groupId>org.apache.maven</groupId>
20
	  <artifactId>maven-ant-tasks</artifactId>
21
	  <version>2.1.3</version>
22
      <scope>runtime</scope>
23
	</dependency>
24
    <dependency>
19 25
      <groupId>org.slf4j</groupId>
20 26
      <artifactId>slf4j-api</artifactId>
21 27
      <scope>provided</scope>

Also available in: Unified diff