incubator-graffito-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From okiess...@apache.org
Subject svn commit: r332341 - in /incubator/graffito/trunk/jcr-mapping: project.xml src/java/org/apache/portals/graffito/jcr/repository/RepositoryUtil.java
Date Thu, 10 Nov 2005 18:00:40 GMT
Author: okiessler
Date: Thu Nov 10 10:00:33 2005
New Revision: 332341

URL: http://svn.apache.org/viewcvs?rev=332341&view=rev
Log:
Issue: GRFT-71

Modified:
    incubator/graffito/trunk/jcr-mapping/project.xml
    incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/repository/RepositoryUtil.java

Modified: incubator/graffito/trunk/jcr-mapping/project.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jcr-mapping/project.xml?rev=332341&r1=332340&r2=332341&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr-mapping/project.xml (original)
+++ incubator/graffito/trunk/jcr-mapping/project.xml Thu Nov 10 10:00:33 2005
@@ -1,182 +1,180 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 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
-
-    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.
+	Copyright 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
+	
+	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.
 -->
 
 <project>
-  <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <id>graffito-jcr-mapping</id>
-  <groupId>graffito</groupId>
-  <name>Graffito JCR Mapping</name>
-  <currentVersion>1.0-a1-dev</currentVersion>
-  <package>org.apache.portals.graffito</package>
-  <description>
-	  This subproject  contains the JCR Mapping tools
-  </description>
-  <shortDescription>Graffito JCR Mapping Tools</shortDescription>
-
-  <repository>
-    <connection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/jcr-mapping</connection>
-    <developerConnection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/jcr-mapping</developerConnection>
-    <url>http://svn.apache.org/viewcvs</url>
-  </repository>
-
-  <dependencies> 
-
-    <dependency>  
-      <id>graffito-commons</id>
-      <groupId>graffito</groupId>
-      <version>1.0-a1-dev</version>
-    </dependency>
-    <dependency>
-      <groupId>jackrabbit</groupId>
-      <artifactId>jackrabbit-core</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>jackrabbit</groupId>
-      <artifactId>jackrabbit-commons</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>jackrabbit</groupId>
-      <artifactId>jackrabbit-api</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>        	 
-    <dependency>
-      <id>concurrent</id>
-      <version>1.3.4</version>
-    </dependency>
-    <dependency>
-      <id>junit</id>
-      <version>3.8.1</version>
-    </dependency>
-    <dependency>
-      <id>commons-collections</id>
-      <version>3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-jta</artifactId>
-      <version>1.0-M1</version>
-    </dependency>
-    <dependency>
-      <groupId>jsr170</groupId>
-      <artifactId>jcr</artifactId>
-      <version>1.0</version>
-      <url>http://www.day.com/maven/jsr170/jars/jcr-1.0.jar</url>
-    </dependency>
-    <dependency>
-      <id>log4j</id>
-      <version>1.2.8</version>
-    </dependency>
-    <dependency>
-      <groupId>lucene</groupId>
-      <artifactId>lucene</artifactId>
-      <version>1.4.3</version>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.6.2</version>
-    </dependency>
-    <!--
-      cqfs-jackrabbit and cqfs are optional runtime dependencies 
-      (an alternative FileSystem implementation); 
-      commons-logging is a dependency of cqfs
-    -->
-    <dependency>
-      <groupId>cqfs</groupId>
-      <artifactId>cqfs-jackrabbit</artifactId>
-      <version>3.5.6</version>
-      <url>http://www.day.com/maven/cqfs/jars/cqfs-jackrabbit-3.5.6.jar</url>
-    </dependency>
-    <dependency>
-      <groupId>cqfs</groupId>
-      <artifactId>cqfs</artifactId>
-      <version>3.5.6</version>
-      <url>http://www.day.com/maven/cqfs/jars/cqfs-3.5.6.jar</url>
-    </dependency>
-
-    <dependency>
-      <id>commons-logging</id>
-      <version>1.0.2</version>
-      <url>http://jakarta.apache.org/commons/logging.html</url>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-beanutils</groupId>
-      <typeId>jar</typeId>
-      <artifactId>commons-beanutils</artifactId>
-      <version>1.7.0</version>
-
-    </dependency>
-    
-    <dependency>
-      <groupId>commons-digester</groupId>
-      <typeId>jar</typeId>
-      <artifactId>commons-digester</artifactId>
-      <version>1.7</version>
-
-    </dependency>
-
-    <!-- runtime dependencies only required for testing and sample programs -->
-    <dependency>
-      <id>xerces</id>
-      <version>2.4.0</version>
-      <url>http://xml.apache.org/xerces2-j/index.html</url>
-    </dependency>
-
-    <dependency>
-      <id>xml-apis</id>
-      <version>1.0.b2</version>
-      <url>http://xml.apache.org/commons/</url>
-    </dependency>   
-  </dependencies>  
-  
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-
-    <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-    <unitTest>
-        <excludes>
-          <exclude>org/apache/portals/graffito/jcr/testmodel/**/*.java</exclude>
-          <exclude>**/*TestBase.java</exclude>
-        </excludes>    
-      <resources>
-        <resource>
-          <directory>${basedir}/src/test</directory>
-          <excludes>
-           <exclude>**/*.java</exclude>
-          </excludes>
-        </resource>
-      </resources>
-    </unitTest>
-    
-    <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-
-  </build>
-  <reports>
-       <report>maven-javadoc-plugin</report>
-  </reports>
+	<extend>${basedir}/../project.xml</extend>
+	<pomVersion>3</pomVersion>
+	<id>graffito-jcr-mapping</id>
+	<groupId>graffito</groupId>
+	<name>Graffito JCR Mapping</name>
+	<currentVersion>1.0-a1-dev</currentVersion>
+	<package>org.apache.portals.graffito</package>
+	<description>This subproject contains the JCR Mapping tools</description>
+	<shortDescription>Graffito JCR Mapping Tools</shortDescription>
+
+	<repository>
+		<connection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/jcr-mapping</connection>
+		<developerConnection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/jcr-mapping</developerConnection>
+		<url>http://svn.apache.org/viewcvs</url>
+	</repository>
+
+	<dependencies>
+
+		<dependency>
+			<id>graffito-commons</id>
+			<groupId>graffito</groupId>
+			<version>1.0-a1-dev</version>
+		</dependency>
+		<dependency>
+			<groupId>jackrabbit</groupId>
+			<artifactId>jackrabbit</artifactId>
+			<version>1.0-20051109-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<id>concurrent</id>
+			<version>1.3.4</version>
+		</dependency>
+		<dependency>
+			<id>junit</id>
+			<version>3.8.1</version>
+		</dependency>
+		<dependency>
+			<id>commons-collections</id>
+			<version>3.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.1</version>
+			<type>jar</type>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>geronimo-spec</groupId>
+			<artifactId>geronimo-spec-jta</artifactId>
+			<version>1.0-M1</version>
+		</dependency>
+		<dependency>
+			<groupId>jsr170</groupId>
+			<artifactId>jcr</artifactId>
+			<version>1.0</version>
+			<url>http://www.day.com/maven/jsr170/jars/jcr-1.0.jar</url>
+		</dependency>
+		<dependency>
+			<id>log4j</id>
+			<version>1.2.8</version>
+		</dependency>
+		<dependency>
+			<groupId>lucene</groupId>
+			<artifactId>lucene</artifactId>
+			<version>1.4.3</version>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.6.2</version>
+		</dependency>
+		<!--
+			cqfs-jackrabbit and cqfs are optional runtime dependencies 
+			(an alternative FileSystem implementation); 
+			commons-logging is a dependency of cqfs
+		-->
+		<dependency>
+			<groupId>cqfs</groupId>
+			<artifactId>cqfs-jackrabbit</artifactId>
+			<version>3.5.6</version>
+			<url>http://www.day.com/maven/cqfs/jars/cqfs-jackrabbit-3.5.6.jar</url>
+		</dependency>
+		<dependency>
+			<groupId>cqfs</groupId>
+			<artifactId>cqfs</artifactId>
+			<version>3.5.6</version>
+			<url>http://www.day.com/maven/cqfs/jars/cqfs-3.5.6.jar</url>
+		</dependency>
+
+		<dependency>
+			<id>commons-logging</id>
+			<version>1.0.2</version>
+			<url>http://jakarta.apache.org/commons/logging.html</url>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<typeId>jar</typeId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.7.0</version>
+
+		</dependency>
+
+		<dependency>
+			<groupId>commons-digester</groupId>
+			<typeId>jar</typeId>
+			<artifactId>commons-digester</artifactId>
+			<version>1.7</version>
+
+		</dependency>
+
+		<!-- runtime dependencies only required for testing and sample programs -->
+		<dependency>
+			<id>xerces</id>
+			<version>2.4.0</version>
+			<url>http://xml.apache.org/xerces2-j/index.html</url>
+		</dependency>
+
+		<dependency>
+			<id>xml-apis</id>
+			<version>1.0.b2</version>
+			<url>http://xml.apache.org/commons/</url>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<sourceDirectory>src/java</sourceDirectory>
+
+		<unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+		<unitTest>
+			<excludes>
+				<exclude>org/apache/portals/graffito/jcr/testmodel/**/*.java</exclude>
+				<exclude>**/*TestBase.java</exclude>
+			</excludes>
+			<resources>
+				<resource>
+					<directory>${basedir}/src/test</directory>
+					<excludes>
+						<exclude>**/*.java</exclude>
+					</excludes>
+				</resource>
+			</resources>
+		</unitTest>
+
+		<resources>
+			<resource>
+				<directory>${basedir}/src/java</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</resource>
+		</resources>
+
+	</build>
+	<reports>
+		<report>maven-javadoc-plugin</report>
+	</reports>
 </project>

Modified: incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/repository/RepositoryUtil.java
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/repository/RepositoryUtil.java?rev=332341&r1=332340&r2=332341&view=diff
==============================================================================
--- incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/repository/RepositoryUtil.java
(original)
+++ incubator/graffito/trunk/jcr-mapping/src/java/org/apache/portals/graffito/jcr/repository/RepositoryUtil.java
Thu Nov 10 10:00:33 2005
@@ -26,7 +26,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.core.jndi.RegistryHelper;
-import org.apache.jackrabbit.core.util.ISO9075;
+import org.apache.jackrabbit.util.ISO9075;
 import org.apache.jackrabbit.util.Text;
 import org.apache.portals.graffito.jcr.exception.PersistenceException;
 import org.apache.portals.graffito.jcr.exception.RepositoryException;



Mime
View raw message