[zanata/zanata-server] bae3c7: Move zanata-assets as JAR and as dependency from z...
GitHub
noreply at github.com
Mon Apr 20 04:58:19 UTC 2015
Branch: refs/heads/master
Home: https://github.com/zanata/zanata-server
Commit: bae3c77b6fa4f12e5233ff3190e76a2865c5be36
https://github.com/zanata/zanata-server/commit/bae3c77b6fa4f12e5233ff3190e76a2865c5be36
Author: Alex Eng <aeng at redhat.com>
Date: 2015-04-20 (Mon, 20 Apr 2015)
Changed paths:
M docs/release-notes.md
M pom.xml
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
A zanata-war/src/main/java/org/zanata/WebAssetsConfiguration.java
M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/account/inactive_account.xhtml
M zanata-war/src/main/webapp/account/login.xhtml
M zanata-war/src/main/webapp/account/password_reset.xhtml
M zanata-war/src/main/webapp/account/password_reset_request.xhtml
M zanata-war/src/main/webapp/account/register.xhtml
Log Message:
-----------
Move zanata-assets as JAR and as dependency from zanata-server
https://bugzilla.redhat.com/show_bug.cgi?id=1207423
Squashed commit of the following:
commit 400b523966d085c6f346e95e56144225e6b37e8f
Merge: 6a59b8a 9c3d0e6
Author: Alex Eng <aeng at redhat.com>
Date: Mon Apr 20 10:18:40 2015 +1000
Merge branch 'integration/master' into zanata-assets-jar
commit 6a59b8a892d82d287a3b81a733f279f212252eb2
Author: Alex Eng <aeng at redhat.com>
Date: Fri Apr 17 07:08:34 2015 +1000
Change overriding of to system properties
commit 9e90103ad33c4e09d6c3f015ec76885429f430c2
Author: Alex Eng <aeng at redhat.com>
Date: Thu Apr 16 16:52:15 2015 +1000
Update release notes, add bean for assets['resource']
commit 253579d009fbf37a340cb72bf74a2aef68278d51
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 14 13:05:10 2015 +1000
Add jars/assets as prefix for zanata-assets resource
commit 5070aa69dc2cd99121f11a673a25eb33027e68fb
Merge: f28152e 4b1baa5
Author: Alex Eng <aeng at redhat.com>
Date: Wed Apr 1 12:39:50 2015 +1000
Merge branch 'integration/master' into zanata-assets-jar
Conflicts:
zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
commit f28152e856930f7dd69eb1ee76a62e4042c017a4
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 31 08:45:05 2015 +1000
Refactor assets url to be configurable in standalone.xml
commit 9194662feb68e33626b0ed4d65a542b81faedfbe
Author: Alex Eng <aeng at redhat.com>
Date: Mon Mar 30 15:00:59 2015 +1000
Add release notes and comments for zanata-assets-jar changes
commit 5a3f613ef1ad3250f2525dfe6279e5c957d83173
Author: Alex Eng <aeng at redhat.com>
Date: Mon Mar 30 13:23:31 2015 +1000
Remove webAssets config, add urlrewrite for .seam extension of resource file
commit f1e12dd8f35f246a7c1bc9f65ec7f4391bb1662d
Author: Alex Eng <aeng at redhat.com>
Date: Fri Mar 27 15:51:39 2015 +1000
Migrate to zanata-assets.jar reference
More information about the zanata-commits
mailing list