You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2009/05/20 19:37:37 UTC

svn commit: r776780 - in /jackrabbit/branches/1.x: ./ jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/XMLChar.java jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/XMLChar.java

Author: jukka
Date: Wed May 20 17:37:37 2009
New Revision: 776780

URL: http://svn.apache.org/viewvc?rev=776780&view=rev
Log:
1.x: Merged revisions 776776 and 776777 (updated license headers)

Modified:
    jackrabbit/branches/1.x/   (props changed)
    jackrabbit/branches/1.x/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/XMLChar.java
    jackrabbit/branches/1.x/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/XMLChar.java

Propchange: jackrabbit/branches/1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 20 17:37:37 2009
@@ -1 +1 @@
-/jackrabbit/trunk:770143-773197,773483,773525-773554,773584,773588,773828,773835-775756,775833,775836,775840,775868,775981,775986,776036,776256,776310,776313,776321-776322,776332,776356-776357,776362,776373,776650-776693,776737
+/jackrabbit/trunk:770143-773197,773483,773525-773554,773584,773588,773828,773835-775756,775833,775836,775840,775868,775981,775986,776036,776256,776310,776313,776321-776322,776332,776356-776357,776362,776373,776650-776693,776737,776776-776777

Modified: jackrabbit/branches/1.x/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/XMLChar.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.x/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/XMLChar.java?rev=776780&r1=776779&r2=776780&view=diff
==============================================================================
--- jackrabbit/branches/1.x/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/XMLChar.java (original)
+++ jackrabbit/branches/1.x/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/XMLChar.java Wed May 20 17:37:37 2009
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
  *

Modified: jackrabbit/branches/1.x/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/XMLChar.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.x/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/XMLChar.java?rev=776780&r1=776779&r2=776780&view=diff
==============================================================================
--- jackrabbit/branches/1.x/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/XMLChar.java (original)
+++ jackrabbit/branches/1.x/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/XMLChar.java Wed May 20 17:37:37 2009
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * 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
+ * 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
  *