You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/11/03 10:56:08 UTC
[2/3] struts-archetypes git commit: Reformats code
Reformats code
Project: http://git-wip-us.apache.org/repos/asf/struts-archetypes/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-archetypes/commit/df51fa4e
Tree: http://git-wip-us.apache.org/repos/asf/struts-archetypes/tree/df51fa4e
Diff: http://git-wip-us.apache.org/repos/asf/struts-archetypes/diff/df51fa4e
Branch: refs/heads/master
Commit: df51fa4ee1ca5935f2d0e91ddbb31e76b9d67a03
Parents: 8237fcc
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Thu Nov 3 11:44:35 2016 +0100
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Thu Nov 3 11:44:35 2016 +0100
----------------------------------------------------------------------
pom.xml | 7 +-
struts2-archetype-blank/pom.xml | 3 +-
struts2-archetype-convention/pom.xml | 3 +-
.../main/resources/archetype-resources/pom.xml | 6 +-
struts2-archetype-dbportlet/pom.xml | 3 +-
.../main/resources/archetype-resources/pom.xml | 66 ++++++++---------
struts2-archetype-plugin/pom.xml | 3 +-
.../main/resources/archetype-resources/pom.xml | 4 +-
struts2-archetype-portlet/pom.xml | 3 +-
.../main/resources/archetype-resources/pom.xml | 76 ++++++++++----------
struts2-archetype-starter/pom.xml | 3 +-
.../main/resources/archetype-resources/pom.xml | 66 ++++++++---------
12 files changed, 125 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/df51fa4e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 09a07b8..75c0e4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,8 @@
* under the License.
*/
-->
-<project 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/maven-v4_0_0.xsd">
+<project 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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts</groupId>
@@ -64,7 +65,7 @@
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
- <comments />
+ <comments/>
</license>
</licenses>
@@ -84,7 +85,7 @@
</modules>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/df51fa4e/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --git a/struts2-archetype-blank/pom.xml b/struts2-archetype-blank/pom.xml
index 476bbfe..b017964 100644
--- a/struts2-archetype-blank/pom.xml
+++ b/struts2-archetype-blank/pom.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project 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/maven-v4_0_0.xsd">
+<project 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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/df51fa4e/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --git a/struts2-archetype-convention/pom.xml b/struts2-archetype-convention/pom.xml
index 244fa0d..03230e3 100644
--- a/struts2-archetype-convention/pom.xml
+++ b/struts2-archetype-convention/pom.xml
@@ -1,4 +1,5 @@
-<project 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/maven-v4_0_0.xsd">
+<project 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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/df51fa4e/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml b/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
index b7b715a..da94717 100644
--- a/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
@@ -35,9 +35,9 @@
</dependency>
<dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-config-browser-plugin</artifactId>
- <version>\${struts2.version}</version>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-config-browser-plugin</artifactId>
+ <version>\${struts2.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/df51fa4e/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --git a/struts2-archetype-dbportlet/pom.xml b/struts2-archetype-dbportlet/pom.xml
index 96faf3f..7d2fe2f 100644
--- a/struts2-archetype-dbportlet/pom.xml
+++ b/struts2-archetype-dbportlet/pom.xml
@@ -1,4 +1,5 @@
-<project 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/maven-v4_0_0.xsd">
+<project 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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/df51fa4e/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml b/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
index e1826d9..7bf5ab2 100644
--- a/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
@@ -1,38 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
<groupId>\${groupId}</groupId>
<artifactId>\${artifactId}</artifactId>
<version>\${version}</version>
<packaging>war</packaging>
<name>\${artifactId}</name>
- <url>http://www.myComp.com</url>
- <description>Struts 2 Database Portlet</description>
+ <url>http://www.myComp.com</url>
+ <description>Struts 2 Database Portlet</description>
<properties>
<struts2.version>${project.version}</struts2.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ </properties>
- <dependencies>
+ <dependencies>
- <!-- Junit -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
+ <!-- Junit -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
- <!-- Struts 2 -->
- <dependency>
+ <!-- Struts 2 -->
+ <dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
<version>\${struts2.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-portlet-plugin</artifactId>
<version>\${struts2.version}</version>
@@ -49,11 +49,11 @@
<artifactId>struts2-spring-plugin</artifactId>
<version>\${struts2.version}</version>
</dependency>
-
+
<dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-config-browser-plugin</artifactId>
- <version>\${struts2.version}</version>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-config-browser-plugin</artifactId>
+ <version>\${struts2.version}</version>
</dependency>
<!-- Spring -->
@@ -64,13 +64,13 @@
</dependency>
<!-- Database driver (change for your specific database) -->
- <dependency>
+ <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.7</version>
</dependency>
- <!-- Servlet, Jsp, and Portlet API's -->
+ <!-- Servlet, Jsp, and Portlet API's -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -93,21 +93,21 @@
</dependency>
</dependencies>
-
+
<build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.21</version>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.21</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<scanTargets>
@@ -123,7 +123,7 @@
<version>2.0</version>
</dependency>
</dependencies>
- </plugin>
- </plugins>
+ </plugin>
+ </plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/df51fa4e/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/struts2-archetype-plugin/pom.xml b/struts2-archetype-plugin/pom.xml
index 1747c67..ced1574 100644
--- a/struts2-archetype-plugin/pom.xml
+++ b/struts2-archetype-plugin/pom.xml
@@ -1,4 +1,5 @@
-<project 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/maven-v4_0_0.xsd">
+<project 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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/df51fa4e/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml b/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
index 0f2209e..d3f78c6 100644
--- a/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
@@ -30,7 +30,7 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
-
+
</dependencies>
<build>
@@ -38,6 +38,6 @@
</build>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/df51fa4e/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --git a/struts2-archetype-portlet/pom.xml b/struts2-archetype-portlet/pom.xml
index 530a9ec..412f581 100644
--- a/struts2-archetype-portlet/pom.xml
+++ b/struts2-archetype-portlet/pom.xml
@@ -1,4 +1,5 @@
-<project 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/maven-v4_0_0.xsd">
+<project 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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/df51fa4e/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml b/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
index e284dea..4fe82cf 100644
--- a/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
@@ -10,13 +10,13 @@
<name>${artifactId}</name>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<struts2.version>${project.version}</struts2.version>
- <portlet.api.version>2.0</portlet.api.version>
- <!-- plugins -->
- <plugin.compiler.version>3.0</plugin.compiler.version>
- <plugin.war.version>2.3</plugin.war.version>
- <plugin.pluto.version>2.0.3</plugin.pluto.version>
+ <portlet.api.version>2.0</portlet.api.version>
+ <!-- plugins -->
+ <plugin.compiler.version>3.0</plugin.compiler.version>
+ <plugin.war.version>2.3</plugin.war.version>
+ <plugin.pluto.version>2.0.3</plugin.pluto.version>
</properties>
<dependencies>
@@ -40,7 +40,7 @@
<version>${portlet.api.version}</version>
<scope>provided</scope>
</dependency>
-
+
</dependencies>
<build>
@@ -57,35 +57,35 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>pluto-embedded</id>
- <build>
- <plugins>
- <!-- configure maven-war-plugin to use updated web.xml -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>${plugin.war.version}</version>
- <configuration>
- <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
- </configuration>
- </plugin>
- <!-- bind 'pluto2:assemble' goal to 'generate-resources' lifecycle -->
- <plugin>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>maven-pluto-plugin</artifactId>
- <version>${plugin.pluto.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>pluto-embedded</id>
+ <build>
+ <plugins>
+ <!-- configure maven-war-plugin to use updated web.xml -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${plugin.war.version}</version>
+ <configuration>
+ <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+ </configuration>
+ </plugin>
+ <!-- bind 'pluto2:assemble' goal to 'generate-resources' lifecycle -->
+ <plugin>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>maven-pluto-plugin</artifactId>
+ <version>${plugin.pluto.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>assemble</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/df51fa4e/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --git a/struts2-archetype-starter/pom.xml b/struts2-archetype-starter/pom.xml
index 5855e2f..6adc2a2 100644
--- a/struts2-archetype-starter/pom.xml
+++ b/struts2-archetype-starter/pom.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project 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/maven-v4_0_0.xsd">
+<project 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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/struts-archetypes/blob/df51fa4e/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml b/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
index b90f235..ec52441 100644
--- a/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
<groupId>\${groupId}</groupId>
<artifactId>\${artifactId}</artifactId>
<version>\${version}</version>
<packaging>war</packaging>
<name>\${artifactId}</name>
- <description>Struts 2 Starter</description>
+ <description>Struts 2 Starter</description>
<properties>
<struts2.version>${project.version}</struts2.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <dependencies>
- <!-- Junit -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
+ <dependencies>
+ <!-- Junit -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
- <!-- Struts 2 -->
- <dependency>
+ <!-- Struts 2 -->
+ <dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
<version>\${struts2.version}</version>
@@ -48,8 +48,8 @@
<version>\${struts2.version}</version>
</dependency>
- <!-- Servlet & Jsp -->
- <dependency>
+ <!-- Servlet & Jsp -->
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
@@ -64,32 +64,32 @@
</dependency>
- <!-- Jakarta Commons -->
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.3</version>
- </dependency>
+ <!-- Jakarta Commons -->
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.3</version>
+ </dependency>
- <!-- Dwr -->
- <dependency>
- <groupId>uk.ltd.getahead</groupId>
- <artifactId>dwr</artifactId>
- <version>1.1-beta-3</version>
- </dependency>
+ <!-- Dwr -->
+ <dependency>
+ <groupId>uk.ltd.getahead</groupId>
+ <artifactId>dwr</artifactId>
+ <version>1.1-beta-3</version>
+ </dependency>
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>8.1.7.v20120910</version>
@@ -121,6 +121,6 @@
</dependency>
</dependencies>
</plugin>
- </plugins>
+ </plugins>
</build>
</project>