[01/10] struts git commit: Merge branch 'master' into develop
Repository: struts Updated Branches: refs/heads/master 26ab3e477 -> 003fe35c9 Merge branch 'master' into develop Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ea098ba0 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ea098ba0 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ea098ba0 Branch: refs/heads/master Commit: ea098ba08ff0a326f7d30ac9dacc7b48c3ba3151 Parents: 7063f5e 26ab3e4 Author: Lukasz Lenart Authored: Sun May 3 14:01:21 2015 +0200 Committer: Lukasz Lenart Committed: Sun May 3 14:01:21 2015 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml| 2 +- archetypes/struts2-archetype-starter/pom.xml| 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 4 ++-- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/java8-support/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 53 files changed, 55 insertions(+), 55 deletions(-) --
[04/10] struts git commit: Uses proper path to docs
Uses proper path to docs Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b01a7d56 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b01a7d56 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b01a7d56 Branch: refs/heads/master Commit: b01a7d566ad219b6bc5da59d99a592d65b51ccd3 Parents: d832747 Author: Lukasz Lenart Authored: Wed May 6 07:49:45 2015 +0200 Committer: Lukasz Lenart Committed: Wed May 6 07:49:45 2015 +0200 -- assembly/pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/b01a7d56/assembly/pom.xml -- diff --git a/assembly/pom.xml b/assembly/pom.xml index bf520e6..9e63d43 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -16,6 +16,8 @@ maven-site-plugin +true +true false @@ -100,7 +102,7 @@ -http://struts.apache.org/development/2.x/docs/"; /> +http://struts.apache.org/docs/"; />
[07/10] struts git commit: Remove unused dependency from ApacheProjectsController
Remove unused dependency from ApacheProjectsController
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/aa1e50f4
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/aa1e50f4
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/aa1e50f4
Branch: refs/heads/master
Commit: aa1e50f4124f5861a2ea9a4014c897bf29a59d1b
Parents: ea098ba
Author: Johannes Geppert
Authored: Wed May 6 20:34:35 2015 +0200
Committer: Johannes Geppert
Committed: Wed May 6 20:34:35 2015 +0200
--
.../archetype-resources/src/main/webapp/js/controllers.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/aa1e50f4/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
index ed57b00..f0d72f1 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
@@ -24,7 +24,7 @@ angularStrutsApp.controller('HomeController', function
($scope) {
$scope.name = "Sunshine";
});
-angularStrutsApp.controller('ApacheProjectsController', function ($scope,
$http, DataService) {
+angularStrutsApp.controller('ApacheProjectsController', function ($scope,
DataService) {
this.init = function() {
DataService.getProjects().then(function(data) {
$scope.projects = data.data.projectNames;
[03/10] struts git commit: Applies better exclude patterns
Applies better exclude patterns
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d832747d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d832747d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d832747d
Branch: refs/heads/master
Commit: d832747d647df343ed07a58b1b5e540a05a4d51b
Parents: 8ab3272
Author: Lukasz Lenart
Authored: Sun May 3 20:57:15 2015 +0200
Committer: Lukasz Lenart
Committed: Sun May 3 20:57:15 2015 +0200
--
core/src/main/resources/struts-default.xml| 18 +-
.../interceptor/CookieInterceptorTest.java| 5 -
.../security/DefaultExcludedPatternsChecker.java | 12 ++--
.../DefaultExcludedPatternsCheckerTest.java | 7 +--
.../src/test/resources/xwork-param-test.xml | 3 ++-
5 files changed, 18 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/d832747d/core/src/main/resources/struts-default.xml
--
diff --git a/core/src/main/resources/struts-default.xml
b/core/src/main/resources/struts-default.xml
index 43f69ed..256d056 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -52,7 +52,7 @@
ognl.TypeConverter,
com.opensymphony.xwork2.ActionContext" />
-
+
@@ -224,9 +224,7 @@
-
-^action:.*,^method:.*
-
+
@@ -281,9 +279,7 @@
-
-^action:.*,^method:.*
-
+
@@ -291,9 +287,7 @@
-
-^action:.*,^method:.*
-
+
input,back,cancel,browse
@@ -329,9 +323,7 @@
-
-^action:.*,^method:.*
-
+
input,back,cancel,browse
http://git-wip-us.apache.org/repos/asf/struts/blob/d832747d/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
--
diff --git
a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
index a531a69..170d7b5 100644
---
a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
+++
b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
@@ -27,6 +27,7 @@ import java.util.Map;
import javax.servlet.http.Cookie;
+import com.opensymphony.xwork2.security.DefaultAcceptedPatternsChecker;
import com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker;
import com.opensymphony.xwork2.mock.MockActionInvocation;
import org.easymock.MockControl;
@@ -370,7 +371,9 @@ public class CookieInterceptorTest extends
StrutsInternalTestCase {
return accepted;
}
};
-interceptor.setExcludedPatternsChecker(new
DefaultExcludedPatternsChecker());
+DefaultExcludedPatternsChecker excludedPatternsChecker = new
DefaultExcludedPatternsChecker();
+
excludedPatternsChecker.setAdditionalExcludePatterns(".*(^|\\.|\\[|'|\")class(\\.|\\[|'|\").*");
+interceptor.setExcludedPatternsChecker(excludedPatternsChecker);
interceptor.setCookiesName("*");
MockActionInvocation invocation = new MockActionInvocation();
http://git-wip-us.apache.org/repos/asf/struts/blob/d832747d/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
index 8878dd2..d96b67a 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
@@ -16,16 +16,8 @@ public class DefaultExcludedPatternsChecker implements
ExcludedPatternsChecker {
private static final Logger LOG =
LoggerFactory.getLogger(DefaultExcludedPatternsChecker.class);
public static final String[] EXCLUDED_PAT
[09/10] struts git commit: Merge branch 'struts-2-3-20-1' into develop
Merge branch 'struts-2-3-20-1' into develop Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ebb1e3fe Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ebb1e3fe Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ebb1e3fe Branch: refs/heads/master Commit: ebb1e3fe395c4c07191037cc5ff32e7223bd5ac9 Parents: ea098ba f19707c Author: Lukasz Lenart Authored: Fri May 15 21:35:40 2015 +0200 Committer: Lukasz Lenart Committed: Fri May 15 21:35:40 2015 +0200 -- --
[06/10] struts git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f19707cb Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f19707cb Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f19707cb Branch: refs/heads/master Commit: f19707cb760bbc2d4a055d946350d392b924bc89 Parents: a9974ee Author: Lukasz Lenart Authored: Wed May 6 07:59:11 2015 +0200 Committer: Lukasz Lenart Committed: Wed May 6 07:59:11 2015 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml| 2 +- archetypes/struts2-archetype-starter/pom.xml| 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 6 +++--- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- xwork-core/pom.xml | 2 +- 52 files changed, 56 insertions(+), 56 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 248904b..0ef12d5 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.1 +2.3.20.2-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 90747fd..0447b43 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.1 +2.3.20.2-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/f19707cb/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 7c2418a..8ef4a4e 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.20.1 + 2.3.20.2-SNAPSHOT struts2
[05/10] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_20_1
[maven-release-plugin] prepare release STRUTS_2_3_20_1 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a9974eec Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a9974eec Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a9974eec Branch: refs/heads/master Commit: a9974eec5689a7113a6fb1e2096252f0935064dd Parents: b01a7d5 Author: Lukasz Lenart Authored: Wed May 6 07:57:47 2015 +0200 Committer: Lukasz Lenart Committed: Wed May 6 07:57:47 2015 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml| 2 +- archetypes/struts2-archetype-starter/pom.xml| 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 6 +++--- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- xwork-core/pom.xml | 2 +- 52 files changed, 56 insertions(+), 56 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index ea63abc..248904b 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.1-SNAPSHOT +2.3.20.1 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index fcc5612..90747fd 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.1-SNAPSHOT +2.3.20.1 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/a9974eec/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 14d5021..7c2418a 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.20.1-SNAPSHOT + 2.3.20.1 struts2-mailre
[10/10] struts git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/struts into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/struts into develop Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/003fe35c Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/003fe35c Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/003fe35c Branch: refs/heads/master Commit: 003fe35c909920bc5e5af2473c0376bc126c0b17 Parents: ebb1e3f 0127963 Author: Lukasz Lenart Authored: Fri May 15 21:36:20 2015 +0200 Committer: Lukasz Lenart Committed: Fri May 15 21:36:20 2015 +0200 -- .../src/main/webapp/js/controllers.js| 8 .../src/main/webapp/js/services.js | 15 --- 2 files changed, 12 insertions(+), 11 deletions(-) --
[08/10] struts git commit: Correct usage of promises and improve logging in data service
Correct usage of promises and improve logging in data service
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/01279636
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/01279636
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/01279636
Branch: refs/heads/master
Commit: 01279636d9160508dc94151e19e47a74ddf319aa
Parents: aa1e50f
Author: Johannes Geppert
Authored: Wed May 6 20:49:29 2015 +0200
Committer: Johannes Geppert
Committed: Wed May 6 20:49:29 2015 +0200
--
.../src/main/webapp/js/controllers.js| 8
.../src/main/webapp/js/services.js | 15 ---
2 files changed, 12 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/01279636/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
index f0d72f1..07f12d7 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
@@ -24,12 +24,12 @@ angularStrutsApp.controller('HomeController', function
($scope) {
$scope.name = "Sunshine";
});
-angularStrutsApp.controller('ApacheProjectsController', function ($scope,
DataService) {
+angularStrutsApp.controller('ApacheProjectsController', function ($scope,
$log, DataService) {
this.init = function() {
DataService.getProjects().then(function(data) {
-$scope.projects = data.data.projectNames;
-}, function(data) {
-console.log('Could not receive project names.')
+$scope.projects = data.projectNames;
+}, function() {
+$log.error('Could not receive project names.')
});
};
http://git-wip-us.apache.org/repos/asf/struts/blob/01279636/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services.js
--
diff --git
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services.js
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services.js
index e3be1de..10ec867 100644
---
a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services.js
+++
b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services.js
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-angularStrutsApp.factory('DataService', ['$http', '$q', function($http, $q) {
+angularStrutsApp.factory('DataService', ['$http', '$log', '$q',
function($http, $log, $q) {
var DataService = {
urls : {
@@ -32,18 +32,19 @@ angularStrutsApp.factory('DataService', ['$http', '$q',
function($http, $q) {
}
var def = $q.defer();
if(method === 'GET') {
-return $http.get(url).success(function(data) {
-DataService.data = data;
+$http.get(url).success(function(data) {
def.resolve(data);
-}).error(function() {
-def.reject("Failed to get data");
+}).error(function(data, code) {
+def.reject(data);
+$log.error(data, code);
});
} else if(method === 'POST'){
$http.post(url, model).success(function(data) {
DataService.data = data;
def.resolve(data);
-}).error(function() {
-def.reject("Failed to post data");
+}).error(function(data, code) {
+def.reject(data);
+$log.error(data, code);
});
}
return def.promise;
[02/10] struts git commit: Sets SNAPSHOT version to allow release plugin to work
Sets SNAPSHOT version to allow release plugin to work Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8ab3272d Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8ab3272d Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8ab3272d Branch: refs/heads/master Commit: 8ab3272d9fd547880f06aa32366f7956628e6630 Parents: 0320310 Author: Lukasz Lenart Authored: Sun May 3 20:44:32 2015 +0200 Committer: Lukasz Lenart Committed: Sun May 3 20:44:32 2015 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml| 2 +- archetypes/struts2-archetype-starter/pom.xml| 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 4 ++-- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 52 files changed, 54 insertions(+), 54 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 0336a50..ea63abc 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20 +2.3.20.1-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index aa7de05..fcc5612 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20 +2.3.20.1-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/8ab3272d/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 12fc9a9..14d5021 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.20 + 2.3.20.1-SNAPSHOT struts2-mailreader http:
Git Push Summary
Repository: struts Updated Branches: refs/heads/develop [deleted] 003fe35c9
Git Push Summary
Repository: struts Updated Branches: refs/heads/feature/locale-aware-converters [deleted] 118b57589
struts git commit: Starts work on 2.5 version
Repository: struts Updated Branches: refs/heads/master 003fe35c9 -> 9a33d29be Starts work on 2.5 version Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9a33d29b Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9a33d29b Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9a33d29b Branch: refs/heads/master Commit: 9a33d29bece4ba24560250e587a8f4e63d95548d Parents: 003fe35 Author: Lukasz Lenart Authored: Thu May 21 20:43:19 2015 +0200 Committer: Lukasz Lenart Committed: Thu May 21 20:43:19 2015 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml| 2 +- archetypes/struts2-archetype-starter/pom.xml| 2 +- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/java8-support/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 52 files changed, 53 insertions(+), 53 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/9a33d29b/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 247c89b..f10b53c 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.25-SNAPSHOT +2.5-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/9a33d29b/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 91311a9..0b395cc 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.25-SNAPSHOT +2.5-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/9a33d29b/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 16cad55..9e3e105 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.25-
