You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2019/07/24 09:08:25 UTC
[turbine-archetypes] branch master updated (a6db498 -> b5b4ce8)
This is an automated email from the ASF dual-hosted git repository.
gk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git.
from a6db498 Use https for urls
new ebe49cf -update scm
new 5f0afbd reorder TR.props
new 6b1d3b7 Merge branch 'master' of https://gitbox.apache.org/repos/asf/turbine-archetypes
new f72cb3a Merge branch 'master' of https://gitbox.apache.org/repos/asf/turbine-archetypes
new b5b4ce8 update scm to git, update mysql-connector-java, log4j2, fix port in readme, indentation in pom
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 6 ++---
.../resources/archetype-resources/docs/README.txt | 4 +++-
src/main/resources/archetype-resources/pom.xml | 28 +++++++++++-----------
.../WEB-INF/conf/TurbineResources.properties | 13 +++++-----
4 files changed, 26 insertions(+), 25 deletions(-)
[turbine-archetypes] 04/05: Merge branch 'master' of
https://gitbox.apache.org/repos/asf/turbine-archetypes
Posted by gk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
commit f72cb3a6eea5cf6b5f4b31d73ae7e3219e87740f
Merge: 6b1d3b7 b9f82f6
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Thu Apr 25 11:40:48 2019 +0200
Merge branch 'master' of https://gitbox.apache.org/repos/asf/turbine-archetypes
src/main/resources/archetype-resources/pom.xml | 10 ++++++----
.../archetype-resources/src/main/webapp/META-INF/context.xml | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
[turbine-archetypes] 02/05: reorder TR.props
Posted by gk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
commit 5f0afbd3365841065f3cb0586a85852e4f13e846
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Mon Jan 14 14:35:42 2019 +0100
reorder TR.props
---
.../main/webapp/WEB-INF/conf/TurbineResources.properties | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
index b184621..d266cbd 100644
--- a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
+++ b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
@@ -25,22 +25,21 @@
#
# -------------------------------------------------------------------
-
# -------------------------------------------------------------------
#
-# P I P E L I N E
+# L O G 4 J 2 - L O G G I N G
+#
+# log4j2 may loads automatically if found on classpath, cf. https://logging.apache.org/log4j/2.x
#
# -------------------------------------------------------------------
-pipeline.default.descriptor = WEB-INF/conf/turbine-classic-pipeline.xml
+log4j2.file = log4j2.xml
# -------------------------------------------------------------------
#
-# L O G 4 J 2 - L O G G I N G
-#
-# log4j2 may loads automatically if found on classpath, cf. https://logging.apache.org/log4j/2.x
+# P I P E L I N E
#
# -------------------------------------------------------------------
-log4j2.file = log4j2.xml
+pipeline.default.descriptor = WEB-INF/conf/turbine-classic-pipeline.xml
# -------------------------------------------------------------------
#
[turbine-archetypes] 05/05: update scm to git,
update mysql-connector-java, log4j2, fix port in readme, indentation in pom
Posted by gk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
commit b5b4ce85a8e9057b998ed0493c7e9707be9f4a3f
Merge: f72cb3a a6db498
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Wed Jul 24 11:07:05 2019 +0200
update scm to git, update mysql-connector-java, log4j2, fix port in readme, indentation in pom
pom.xml | 4 +--
.../resources/archetype-resources/docs/README.txt | 4 ++-
src/main/resources/archetype-resources/pom.xml | 30 +++++++++++-----------
3 files changed, 20 insertions(+), 18 deletions(-)
diff --cc pom.xml
index 4ec15db,12983f9..b84cc9f
--- a/pom.xml
+++ b/pom.xml
@@@ -37,12 -37,12 +37,12 @@@
<inceptionYear>2011</inceptionYear>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-5.0/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-5.0/</developerConnection>
- <url>https://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-5.0/</url>
+ <connection>scm:git:https://github.com/apache/turbine-archetypes</connection>
+ <developerConnection>scm:git:https://github.com/apache/turbine-archetypes</developerConnection>
+ <url>scm:git:https://github.com/apache/turbine-archetypes</url>
</scm>
- <build>
+ <build>
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
diff --cc src/main/resources/archetype-resources/docs/README.txt
index 8cb124a,8cb124a..9a527c2
--- a/src/main/resources/archetype-resources/docs/README.txt
+++ b/src/main/resources/archetype-resources/docs/README.txt
@@@ -124,7 -124,7 +124,9 @@@ mvn clean instal
If you get an error like "The driver has not received any packets" probably the database is not up and running or the port may be another one.
Last step on the command line is run the server by invoking
--mvn jetty:run ## Now you can launch your new Turbine application by default http://localhost:8080/app
++mvn jetty:run
++
++## Now you can launch your new Turbine application by default http://localhost:8081/app (check port in pom.xml, if needed).
### Logs
diff --cc src/main/resources/archetype-resources/pom.xml
index 6d7f176,dfa0b59..fcf30b3
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@@ -72,17 -72,17 +72,17 @@@ under the License
</testResources>
<plugins>
<!-- test will not fail in turbine 4.0.1 -->
-- <plugin>
-- <groupId>org.apache.maven.plugins</groupId>
-- <artifactId>maven-surefire-plugin</artifactId>
-- <version>3.0.0-M2</version>
-- <configuration>
-- <skipTests>#var("skipTests")</skipTests>
-- <!--default setting is forkCount=1/reuseForks=true -->
-- <reuseForks>false</reuseForks>
-- <forkCount>1</forkCount>
-- </configuration>
-- </plugin>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-surefire-plugin</artifactId>
++ <version>3.0.0-M2</version>
++ <configuration>
++ <skipTests>#var("skipTests")</skipTests>
++ <!--default setting is forkCount=1/reuseForks=true -->
++ <reuseForks>false</reuseForks>
++ <forkCount>1</forkCount>
++ </configuration>
++ </plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
@@@ -200,7 -200,7 +200,7 @@@
<dependency>
<artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
- <version>8.0.15</version>
- <version>8.0.16</version>
++ <version>8.0.17</version>
</dependency>
</dependencies>
<!-- this is mysql specific -->
@@@ -267,7 -267,7 +267,7 @@@
<dependency>
<artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
- <version>8.0.15</version>
- <version>8.0.16</version>
++ <version>8.0.17</version>
</dependency>
<!-- Allow lookup of #var("web:rootDir") in log4j2 file -->
<dependency>
@@@ -407,7 -407,7 +407,7 @@@
<maven.compile.source>1.8</maven.compile.source>
<maven.compile.target>1.8</maven.compile.target>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-- <log4j2.version>2.11.1</log4j2.version>
++ <log4j2.version>2.12.0</log4j2.version>
<torque.version>4.0</torque.version>
<fulcrum.json>2.0.0</fulcrum.json>
<fulcrum.intake>2.0.0</fulcrum.intake>
[turbine-archetypes] 03/05: Merge branch 'master' of
https://gitbox.apache.org/repos/asf/turbine-archetypes
Posted by gk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
commit 6b1d3b7b7d910f9e0909c523b0ca967ca4def1ff
Merge: 5f0afbd 8e5db34
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Fri Mar 29 08:24:35 2019 +0100
Merge branch 'master' of https://gitbox.apache.org/repos/asf/turbine-archetypes
src/main/resources/archetype-resources/pom.xml | 34 +--
.../main/java/flux/modules/actions/FluxAction.java | 17 +-
.../main/java/flux/modules/actions/FluxLogin.java | 4 +-
.../main/java/flux/modules/actions/FluxLogout.java | 11 +-
.../java/flux/modules/actions/SecureAction.java | 11 +-
.../modules/actions/group/FluxGroupAction.java | 10 +-
.../actions/permission/FluxPermissionAction.java | 10 +-
.../flux/modules/actions/role/FluxRoleAction.java | 15 +-
.../flux/modules/actions/user/FluxUserAction.java | 17 +-
.../main/java/flux/modules/screens/FluxError.java | 2 +-
.../main/java/flux/modules/screens/FluxIndex.java | 5 +-
.../main/java/flux/modules/screens/FluxScreen.java | 16 +-
.../java/flux/modules/screens/group/Default.java | 2 +-
.../flux/modules/screens/permission/Default.java | 2 +-
.../java/flux/modules/screens/role/Default.java | 2 +-
.../java/flux/modules/screens/user/Default.java | 2 +-
.../src/main/java/flux/tools/FluxTool.java | 28 ++-
.../java/modules/actions/ChangePasswordAction.java | 93 ++++----
.../src/main/java/modules/actions/LoginUser.java | 2 +-
.../main/java/modules/actions/LoginUserIntake.java | 249 ++++++++++-----------
.../src/main/java/modules/actions/LogoutUser.java | 7 +-
.../main/java/modules/actions/SecureAction.java | 146 ++++++------
.../src/main/java/modules/actions/ShowRecords.java | 2 +-
.../src/main/java/modules/screens/Index.java | 2 +-
.../main/java/modules/screens/SecureScreen.java | 104 ++++-----
.../src/main/java/wrapper/TurbineUserWrapper.java | 2 +-
.../main/webapp/WEB-INF/conf/roleConfiguration.xml | 7 +-
27 files changed, 381 insertions(+), 421 deletions(-)
[turbine-archetypes] 01/05: -update scm
Posted by gk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
commit ebe49cfafa517e2876ef55cb8cb503c430fb7fea
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Mon Jan 14 14:34:24 2019 +0100
-update scm
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index f5a829e..4ec15db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,9 +37,9 @@
<inceptionYear>2011</inceptionYear>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-5.0/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-5.0/</developerConnection>
- <url>http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-5.0/</url>
+ <connection>scm:git:https://github.com/apache/turbine-archetypes</connection>
+ <developerConnection>scm:git:https://github.com/apache/turbine-archetypes</developerConnection>
+ <url>scm:git:https://github.com/apache/turbine-archetypes</url>
</scm>
<build>