Author: reto
Date: Tue Dec 15 10:55:46 2009
New Revision: 890753
URL: http://svn.apache.org/viewvc?rev=890753&view=rev
Log:
merged down default
Modified:
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/
(props changed)
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitTemplating.java
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/InfoDiscobitWriter.java
Propchange:
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 15 10:55:46 2009
@@ -0,0 +1 @@
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content:890292-890744
Modified:
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitTemplating.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitTemplating.java?rev=890753&r1=890752&r2=890753&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitTemplating.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitTemplating.java
Tue Dec 15 10:55:46 2009
@@ -1,18 +1,20 @@
/*
- * Copyright 2009 clerezza.org (Clerezza AG Switzerland).
- *
- * 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;
Modified:
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/InfoDiscobitWriter.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/InfoDiscobitWriter.java?rev=890753&r1=890752&r2=890753&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/InfoDiscobitWriter.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-23/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/InfoDiscobitWriter.java
Tue Dec 15 10:55:46 2009
@@ -1,18 +1,21 @@
/*
- * Copyright (c) 2008-2009 Clerezza AG.
- *
- * 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.
+ * 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;
import java.io.IOException;
