Author: mir
Date: Wed Mar 3 16:48:06 2010
New Revision: 918563
URL: http://svn.apache.org/viewvc?rev=918563&view=rev
Log:
CLEREZZA-129: merged with trunk
Modified:
incubator/clerezza/issues/CLEREZZA-129/org.apache.clerezza.platform.content/
(props changed)
incubator/clerezza/issues/CLEREZZA-129/org.apache.clerezza.platform.content/pom.xml
incubator/clerezza/issues/CLEREZZA-129/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/IllegalMoveException.java
Propchange:
incubator/clerezza/issues/CLEREZZA-129/org.apache.clerezza.platform.content/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 3 16:48:06 2010
@@ -3,4 +3,4 @@
/incubator/clerezza/issues/CLEREZZA-25/org.apache.clerezza.platform.content:891178-892849
/incubator/clerezza/issues/CLEREZZA-65/org.apache.clerezza.platform.content:897875-897920
/incubator/clerezza/issues/CLEREZZA-70/org.apache.clerezza.platform.content:897917-903631
-/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content:917938-918030
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content:917938-918440
Modified:
incubator/clerezza/issues/CLEREZZA-129/org.apache.clerezza.platform.content/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-129/org.apache.clerezza.platform.content/pom.xml?rev=918563&r1=918562&r2=918563&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-129/org.apache.clerezza.platform.content/pom.xml
(original)
+++
incubator/clerezza/issues/CLEREZZA-129/org.apache.clerezza.platform.content/pom.xml
Wed Mar 3 16:48:06 2010
@@ -2,8 +2,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.apache.clerezza.webapp.parent</artifactId>
<groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.parent</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.clerezza</groupId>
Modified:
incubator/clerezza/issues/CLEREZZA-129/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/IllegalMoveException.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-129/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/IllegalMoveException.java?rev=918563&r1=918562&r2=918563&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-129/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/IllegalMoveException.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-129/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/IllegalMoveException.java
Wed Mar 3 16:48:06 2010
@@ -1,18 +1,20 @@
/*
- * Copyright 2010 mir.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * 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.
- * under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software 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.
*/
package org.apache.clerezza.platform.content.hierarchy;
