You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by ds...@apache.org on 2012/05/23 12:15:50 UTC
svn commit: r1341817 - in /incubator/clerezza/issues/CLEREZZA-617:
platform.typerendering.scalaserverpages/ scala-scripting/
scala-scripting/script-engine/
scala-scripting/script-engine/src/main/appended-resources/
scala-scripting/script-engine/src/mai...
Author: dspicar
Date: Wed May 23 10:15:49 2012
New Revision: 1341817
URL: http://svn.apache.org/viewvc?rev=1341817&view=rev
Log:
CLEREZZA-617: merged changes from trunk with issue and added 'tests' submodule
Added:
incubator/clerezza/issues/CLEREZZA-617/scala-scripting/script-engine/src/main/appended-resources/
- copied from r1341810, incubator/clerezza/trunk/parent/scala-scripting/script-engine/src/main/appended-resources/
incubator/clerezza/issues/CLEREZZA-617/scala-scripting/script-engine/src/main/appended-resources/META-INF/
- copied from r1341810, incubator/clerezza/trunk/parent/scala-scripting/script-engine/src/main/appended-resources/META-INF/
incubator/clerezza/issues/CLEREZZA-617/scala-scripting/src/
- copied from r1341813, incubator/clerezza/trunk/parent/scala-scripting/src/
incubator/clerezza/issues/CLEREZZA-617/scala-scripting/src/main/
- copied from r1341813, incubator/clerezza/trunk/parent/scala-scripting/src/main/
incubator/clerezza/issues/CLEREZZA-617/scala-scripting/src/main/appended-resources/
- copied from r1341813, incubator/clerezza/trunk/parent/scala-scripting/src/main/appended-resources/
incubator/clerezza/issues/CLEREZZA-617/scala-scripting/src/main/appended-resources/META-INF/
- copied from r1341813, incubator/clerezza/trunk/parent/scala-scripting/src/main/appended-resources/META-INF/
Removed:
incubator/clerezza/issues/CLEREZZA-617/scala-scripting/NOTICE.txt
incubator/clerezza/issues/CLEREZZA-617/scala-scripting/script-engine/NOTICE.txt
Modified:
incubator/clerezza/issues/CLEREZZA-617/platform.typerendering.scalaserverpages/pom.xml
incubator/clerezza/issues/CLEREZZA-617/scala-scripting/ (props changed)
incubator/clerezza/issues/CLEREZZA-617/scala-scripting/LICENSE
incubator/clerezza/issues/CLEREZZA-617/scala-scripting/pom.xml
incubator/clerezza/issues/CLEREZZA-617/scala-scripting/script-engine/ (props changed)
incubator/clerezza/issues/CLEREZZA-617/scala-scripting/script-engine/LICENSE
incubator/clerezza/issues/CLEREZZA-617/scala-scripting/script-engine/pom.xml
Modified: incubator/clerezza/issues/CLEREZZA-617/platform.typerendering.scalaserverpages/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-617/platform.typerendering.scalaserverpages/pom.xml?rev=1341817&r1=1341816&r2=1341817&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-617/platform.typerendering.scalaserverpages/pom.xml (original)
+++ incubator/clerezza/issues/CLEREZZA-617/platform.typerendering.scalaserverpages/pom.xml Wed May 23 10:15:49 2012
@@ -23,9 +23,9 @@
<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>
- <artifactId>parent</artifactId>
+ <artifactId>clerezza</artifactId>
<groupId>org.apache.clerezza</groupId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.3-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.scalaserverpages</artifactId>
Propchange: incubator/clerezza/issues/CLEREZZA-617/scala-scripting/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed May 23 10:15:49 2012
@@ -1 +1,5 @@
target
+.project
+.settings
+.scala.iml
+.pom.xml.swp
Propchange: incubator/clerezza/issues/CLEREZZA-617/scala-scripting/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed May 23 10:15:49 2012
@@ -0,0 +1 @@
+/incubator/clerezza/trunk/parent/scala-scripting:1101829-1341813
Modified: incubator/clerezza/issues/CLEREZZA-617/scala-scripting/LICENSE
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-617/scala-scripting/LICENSE?rev=1341817&r1=1341816&r2=1341817&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-617/scala-scripting/LICENSE (original)
+++ incubator/clerezza/issues/CLEREZZA-617/scala-scripting/LICENSE Wed May 23 10:15:49 2012
@@ -198,4 +198,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
- limitations under the License.
+ limitations under the License.
\ No newline at end of file
Modified: incubator/clerezza/issues/CLEREZZA-617/scala-scripting/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-617/scala-scripting/pom.xml?rev=1341817&r1=1341816&r2=1341817&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-617/scala-scripting/pom.xml (original)
+++ incubator/clerezza/issues/CLEREZZA-617/scala-scripting/pom.xml Wed May 23 10:15:49 2012
@@ -20,7 +20,7 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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</groupId>
Propchange: incubator/clerezza/issues/CLEREZZA-617/scala-scripting/script-engine/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed May 23 10:15:49 2012
@@ -3,3 +3,4 @@ target
.project
.settings
.scala_dependencies
+script-engine.iml
Modified: incubator/clerezza/issues/CLEREZZA-617/scala-scripting/script-engine/LICENSE
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-617/scala-scripting/script-engine/LICENSE?rev=1341817&r1=1341816&r2=1341817&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-617/scala-scripting/script-engine/LICENSE (original)
+++ incubator/clerezza/issues/CLEREZZA-617/scala-scripting/script-engine/LICENSE Wed May 23 10:15:49 2012
@@ -198,4 +198,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
- limitations under the License.
+ limitations under the License.
\ No newline at end of file
Modified: incubator/clerezza/issues/CLEREZZA-617/scala-scripting/script-engine/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-617/scala-scripting/script-engine/pom.xml?rev=1341817&r1=1341816&r2=1341817&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-617/scala-scripting/script-engine/pom.xml (original)
+++ incubator/clerezza/issues/CLEREZZA-617/scala-scripting/script-engine/pom.xml Wed May 23 10:15:49 2012
@@ -20,7 +20,7 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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.clerezza.scala</groupId>