You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by mr...@apache.org on 2009/09/11 15:13:02 UTC
svn commit: r813817 - in /jackrabbit/sandbox/JCR-2170: ./
jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefReader.java
jackrabbit-standalone/pom.xml pom.xml
Author: mreutegg
Date: Fri Sep 11 13:13:01 2009
New Revision: 813817
URL: http://svn.apache.org/viewvc?rev=813817&view=rev
Log:
JCR-2170: Remove PropDefId and NodeDefId
- merge with recent changes from trunk
Modified:
jackrabbit/sandbox/JCR-2170/ (props changed)
jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefReader.java
jackrabbit/sandbox/JCR-2170/jackrabbit-standalone/pom.xml
jackrabbit/sandbox/JCR-2170/pom.xml
Propchange: jackrabbit/sandbox/JCR-2170/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 11 13:13:01 2009
@@ -1,2 +1,3 @@
/jackrabbit/branches/1.5:794012,794100,794102
/jackrabbit/sandbox/tripod-JCR-2209:795441-795863
+/jackrabbit/trunk:812417-813816
Modified: jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefReader.java?rev=813817&r1=813816&r2=813817&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefReader.java (original)
+++ jackrabbit/sandbox/JCR-2170/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefReader.java Fri Sep 11 13:13:01 2009
@@ -139,7 +139,7 @@
throw new InternalError(e.toString());
}
}
-
+
/**
* the list of parsed QNodeTypeDefinition
*/
@@ -292,7 +292,7 @@
}
/**
- * Convenience methdo that returns the list of parsed NodeTypeDefinition
+ * Convenience method that returns the list of parsed NodeTypeDefinition
* definitions, using the {@link NodeTypeDefinitionFactory}.
*
* @param session repository session used for converting the definitions.
Modified: jackrabbit/sandbox/JCR-2170/jackrabbit-standalone/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-2170/jackrabbit-standalone/pom.xml?rev=813817&r1=813816&r2=813817&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-2170/jackrabbit-standalone/pom.xml (original)
+++ jackrabbit/sandbox/JCR-2170/jackrabbit-standalone/pom.xml Fri Sep 11 13:13:01 2009
@@ -40,6 +40,12 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
Modified: jackrabbit/sandbox/JCR-2170/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-2170/pom.xml?rev=813817&r1=813816&r2=813817&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-2170/pom.xml (original)
+++ jackrabbit/sandbox/JCR-2170/pom.xml Fri Sep 11 13:13:01 2009
@@ -64,4 +64,15 @@
<url>http://svn.apache.org/viewvc/jackrabbit/trunk</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>