ws-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r1026880 - /webservices/xmlschema/trunk/pom.xml
Date Sun, 24 Oct 2010 20:19:45 GMT
Author: bimargulies
Date: Sun Oct 24 20:19:45 2010
New Revision: 1026880

URL: http://svn.apache.org/viewvc?rev=1026880&view=rev
Log:
Resimplify the eclipse stuff now that I am less of an idiot.

Modified:
    webservices/xmlschema/trunk/pom.xml

Modified: webservices/xmlschema/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/pom.xml?rev=1026880&r1=1026879&r2=1026880&view=diff
==============================================================================
--- webservices/xmlschema/trunk/pom.xml (original)
+++ webservices/xmlschema/trunk/pom.xml Sun Oct 24 20:19:45 2010
@@ -123,11 +123,11 @@
                         </execution>
                     </executions>
                     <dependencies>
-		      <dependency>
-			<groupId>org.apache.ws.xmlschema</groupId>
-			<artifactId>xmlschema-eclipse</artifactId>
-			<version>${project.version}</version>
-		      </dependency>
+                        <dependency>
+                            <groupId>org.apache.ws.xmlschema</groupId>
+                            <artifactId>xmlschema-eclipse</artifactId>
+                            <version>${project.version}</version>
+                        </dependency>
                     </dependencies>
                 </plugin>
                 <plugin>
@@ -271,7 +271,7 @@
             </build>
         </profile>
         <profile>
-            <id>setup.eclipse.workspace</id>
+            <id>setup.eclipse</id>
             <properties>
                 <eclipse.workspace.dir>${basedir}/../workspace</eclipse.workspace.dir>
             </properties>
@@ -296,7 +296,54 @@
                                     <workspaceCodeStylesURL>file:${basedir}/etc/eclipse/XmlSchemaCodeFormatter.xml</workspaceCodeStylesURL>
                                 </configuration>
                             </execution>
+                            <execution>
+                                <id>setup.eclipse.projects</id>
+				<inherited>true</inherited>
+                                <!-- This is the execution that we run only at the top
level. -->
+                                <phase>process-test-sources</phase>
+                                <goals>
+                                    <goal>eclipse</goal>
+                                </goals>
+                                <configuration>
+                                    <workspace>${eclipse.workspace.dir}</workspace>
+                                    <workspaceCodeStylesURL>file:${basedir}/etc/eclipse/XmlSchemaCodeFormatter.xml</workspaceCodeStylesURL>
+                                    <outputDirectory>${eclipse.outputDirectory}</outputDirectory>
+                                    <buildcommands>
+                                        <java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
+                                        <java.lang.String>net.sf.eclipsecs.core.CheckstyleBuilder</java.lang.String>
+                                        <java.lang.String>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</java.lang.String>
+                                    </buildcommands>
+                                    <projectnatures>
+                                        <nature>org.eclipse.jdt.core.javanature</nature>
+                                        <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+                                        <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
+                                    </projectnatures>
+                                    <ajdtVersion>none</ajdtVersion>
+                                    <additionalConfig>
+                                        <file>
+                                            <name>.checkstyle</name>
+                                            <location>/xmlschema-eclipse-checkstyle</location>
+                                        </file>
+                                        <file>
+                                            <name>.pmd</name>
+                                            <location>/xmlschema-eclipse-pmd</location>
+                                        </file>
+                                        <file>
+                                            <name>.ruleset</name>
+                                            <location>/xmlschema-pmd-ruleset.xml</location>
+                                        </file>
+                                    </additionalConfig>
+                                    <workspace>${eclipse.workspace.dir}</workspace>
+                                </configuration>
+                            </execution>
                         </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.ws.xmlschema</groupId>
+                                <artifactId>xmlschema-eclipse</artifactId>
+                                <version>${project.version}</version>
+                            </dependency>
+                        </dependencies>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -329,10 +376,9 @@
                                         <!-- Add checkstyle config for 5.0 plugin -->
                                         <copy file="${basedir}/etc/eclipse/template.checkstyle-config.xml"
tofile="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml"
overwrite="no">
                                             <filterset>
-                                                <filter token="CHECKSTYLE_CONFIG_FILE"
value="${full.eclipse.workspace}/xmlschema-checkstyle.xml" />
+                                                <filter token="CHECKSTYLE_CONFIG_FILE"
value="${full.eclipse.workspace}/xmlschema-checkstyle.xml"/>
                                             </filterset>
                                         </copy>
-
                                         <!-- Add warning flags that we want -->
                                         <propertyfile file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs">
                                             <entry key="org.eclipse.jdt.core.compiler.problem.missingSerialVersion"
value="ignore"/>
@@ -371,67 +417,6 @@
             </build>
         </profile>
         <profile>
-            <id>setup.eclipse.projects</id>
-            <build>
-                <defaultGoal>process-test-sources</defaultGoal>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-eclipse-plugin</artifactId>
-                        <version>2.8</version>
-                        <executions>
-                            <execution>
-                                <id>setup.eclipse.projects</id>
-                                <!-- This is the execution that we run only at the top
level. -->
-                                <phase>process-test-sources</phase>
-                                <goals>
-                                    <goal>eclipse</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-			  <workspace>${eclipse.workspace.dir}</workspace>
-			  <workspaceCodeStylesURL>file:${basedir}/etc/eclipse/XmlSchemaCodeFormatter.xml</workspaceCodeStylesURL>
-                            <outputDirectory>${eclipse.outputDirectory}</outputDirectory>
-                            <buildcommands>
-                                <java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
-                                <java.lang.String>net.sf.eclipsecs.core.CheckstyleBuilder</java.lang.String>
-                                <java.lang.String>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</java.lang.String>
-                            </buildcommands>
-                            <projectnatures>
-                                <nature>org.eclipse.jdt.core.javanature</nature>
-                                <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
-                                <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
-                            </projectnatures>
-                            <ajdtVersion>none</ajdtVersion>
-                            <additionalConfig>
-                                <file>
-                                    <name>.checkstyle</name>
-                                    <location>/xmlschema-eclipse-checkstyle</location>
-                                </file>
-                                <file>
-                                    <name>.pmd</name>
-                                    <location>/xmlschema-eclipse-pmd</location>
-                                </file>
-                                <file>
-                                    <name>.ruleset</name>
-                                    <location>/xmlschema-pmd-ruleset.xml</location>
-                                </file>
-                            </additionalConfig>
-                            <workspace>${eclipse.workspace.dir}</workspace>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.ws.xmlschema</groupId>
-                                <artifactId>xmlschema-eclipse</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
             <id>sourcecheck</id>
             <activation>
                 <activeByDefault>true</activeByDefault>



Mime
View raw message