You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2010/03/23 18:02:42 UTC
svn commit: r926664 - in /myfaces/extensions/scripting/trunk: ./
extscript-bundles/ extscript-bundles/extscript-myfaces12-bundle/
extscript-bundles/extscript-myfaces20-bundle/
extscript-bundles/extscript20-assembly/ extscript-core-root/
extscript-core-...
Author: werpu
Date: Tue Mar 23 17:02:42 2010
New Revision: 926664
URL: http://svn.apache.org/viewvc?rev=926664&view=rev
Log:
merging trunk
Added:
myfaces/extensions/scripting/trunk/testassembly.sh (with props)
Modified:
myfaces/extensions/scripting/trunk/ (props changed)
myfaces/extensions/scripting/trunk/extscript-bundles/ (props changed)
myfaces/extensions/scripting/trunk/extscript-bundles/extscript-myfaces12-bundle/ (props changed)
myfaces/extensions/scripting/trunk/extscript-bundles/extscript-myfaces20-bundle/ (props changed)
myfaces/extensions/scripting/trunk/extscript-bundles/extscript20-assembly/ (props changed)
myfaces/extensions/scripting/trunk/extscript-core-root/ (props changed)
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6/ (props changed)
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces12-extensions/ (props changed)
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/ (props changed)
myfaces/extensions/scripting/trunk/extscript-examples/ (props changed)
myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/ (props changed)
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/ (props changed)
myfaces/extensions/scripting/trunk/extscript-examples/spring-example/ (props changed)
Propchange: myfaces/extensions/scripting/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 23 17:02:42 2010
@@ -1 +1,5 @@
target
+
+extscript-root.iml
+atlassian-ide-plugin.xml
+extscript-root.ipr
Propchange: myfaces/extensions/scripting/trunk/extscript-bundles/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 23 17:02:42 2010
@@ -0,0 +1 @@
+*.iml
Propchange: myfaces/extensions/scripting/trunk/extscript-bundles/extscript-myfaces12-bundle/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 23 17:02:42 2010
@@ -0,0 +1 @@
+extscript-myfaces12-bundle.iml
Propchange: myfaces/extensions/scripting/trunk/extscript-bundles/extscript-myfaces20-bundle/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 23 17:02:42 2010
@@ -0,0 +1 @@
+extscript-myfaces20-bundle.iml
Propchange: myfaces/extensions/scripting/trunk/extscript-bundles/extscript20-assembly/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 23 17:02:42 2010
@@ -0,0 +1 @@
+target
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 23 17:02:42 2010
@@ -0,0 +1 @@
+extscript-core-root.iml
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 23 17:02:42 2010
@@ -0,0 +1 @@
+extscript-core-java6.iml
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces12-extensions/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 23 17:02:42 2010
@@ -0,0 +1 @@
+extscript-myfaces12-extensions.iml
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 23 17:02:42 2010
@@ -0,0 +1 @@
+extscript-myfaces2-extensions.iml
Propchange: myfaces/extensions/scripting/trunk/extscript-examples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 23 17:02:42 2010
@@ -0,0 +1 @@
+extscript-examples.iml
Propchange: myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 23 17:02:42 2010
@@ -0,0 +1 @@
+myfaces12-example.iml
Propchange: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 23 17:02:42 2010
@@ -0,0 +1 @@
+myfaces20-example.iml
Propchange: myfaces/extensions/scripting/trunk/extscript-examples/spring-example/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 23 17:02:42 2010
@@ -0,0 +1 @@
+spring-example.iml
Added: myfaces/extensions/scripting/trunk/testassembly.sh
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/testassembly.sh?rev=926664&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/testassembly.sh (added)
+++ myfaces/extensions/scripting/trunk/testassembly.sh Tue Mar 23 17:02:42 2010
@@ -0,0 +1,5 @@
+#!/bin/sh
+mvn javadoc:jar install
+mvn -Pgenerate-assembly -f ./extscript-bundles/pom.xml
+mvn package
+
\ No newline at end of file
Propchange: myfaces/extensions/scripting/trunk/testassembly.sh
------------------------------------------------------------------------------
svn:executable = *