View File | Revision Log | Show Annotations | Download File | View Changeset
/hippo/hippo-cms7/jackrabbit-patches/2.6.x/trunk/jackrabbit.patch
(Generate patch)

Comparing hippo-cms7/jackrabbit-patches/2.6.x/trunk/jackrabbit.patch (file contents):
Revision 41414 by uhommes, Mon Oct 28 12:41:14 2013 UTC vs.
Revision 41415 by fvlankvelt, Mon Oct 28 16:56:19 2013 UTC

15# 15#
16# REPO-187: forked Jackrabbit 16# REPO-187: forked Jackrabbit
17# The following patches are intended to set a hippo-specific 17# The following patches are intended to set a hippo-specific
18# suffix to the version numbers of the produced artifacts. 18# suffix to the version numbers of the produced artifacts.
19# There are two changes with this patch, first the version 19# There are two changes with this patch, first the version
20# number is changed from 2.6.4 to 2.6.4-h1 and secondly the 20# number is changed from 2.6.4 to 2.6.4-h2 and secondly the
21# maven repository to upload these artifacts to is set to the 21# maven repository to upload these artifacts to is set to the
22# Hippo nexus server. 22# Hippo nexus server.
23# 23#
24Index: pom.xml 24Index: pom.xml
25=================================================================== 25===================================================================
36 36
37--- 27,33 ---- 37--- 27,33 ----
38 <parent> 38 <parent>
39 <groupId>org.apache.jackrabbit</groupId> 39 <groupId>org.apache.jackrabbit</groupId>
40 <artifactId>jackrabbit-parent</artifactId> 40 <artifactId>jackrabbit-parent</artifactId>
41! <version>2.6.4-h1</version> 41! <version>2.6.4-h2</version>
42 <relativePath>jackrabbit-parent/pom.xml</relativePath> 42 <relativePath>jackrabbit-parent/pom.xml</relativePath>
43 </parent> 43 </parent>
44 44
45*************** 45***************
46*** 37,61 **** 46*** 37,61 ****
111 <issueManagement> 111 <issueManagement>
112--- 34,40 ---- 112--- 34,40 ----
113 <groupId>org.apache.jackrabbit</groupId> 113 <groupId>org.apache.jackrabbit</groupId>
114 <artifactId>jackrabbit-parent</artifactId> 114 <artifactId>jackrabbit-parent</artifactId>
115 <name>Jackrabbit Parent POM</name> 115 <name>Jackrabbit Parent POM</name>
116! <version>2.6.4-h1</version> 116! <version>2.6.4-h2</version>
117 <packaging>pom</packaging> 117 <packaging>pom</packaging>
118 118
119 <issueManagement> 119 <issueManagement>
120*************** 120***************
121*** 51,56 **** 121*** 51,56 ****
169 <artifactId>jackrabbit-core</artifactId> 169 <artifactId>jackrabbit-core</artifactId>
170--- 26,32 ---- 170--- 26,32 ----
171 <parent> 171 <parent>
172 <groupId>org.apache.jackrabbit</groupId> 172 <groupId>org.apache.jackrabbit</groupId>
173 <artifactId>jackrabbit-parent</artifactId> 173 <artifactId>jackrabbit-parent</artifactId>
174! <version>2.6.4-h1</version> 174! <version>2.6.4-h2</version>
175 <relativePath>../jackrabbit-parent/pom.xml</relativePath> 175 <relativePath>../jackrabbit-parent/pom.xml</relativePath>
176 </parent> 176 </parent>
177 <artifactId>jackrabbit-core</artifactId> 177 <artifactId>jackrabbit-core</artifactId>
178*** 250,256 **** 178*** 250,256 ****
179 <dependency> 179 <dependency>
185 <groupId>org.apache.jackrabbit</groupId> 185 <groupId>org.apache.jackrabbit</groupId>
186--- 250,256 ---- 186--- 250,256 ----
187 <dependency> 187 <dependency>
188 <groupId>org.apache.jackrabbit</groupId> 188 <groupId>org.apache.jackrabbit</groupId>
189 <artifactId>jackrabbit-spi-commons</artifactId> 189 <artifactId>jackrabbit-spi-commons</artifactId>
190! <version>2.6.4-h1</version> 190! <version>2.6.4-h2</version>
191 </dependency> 191 </dependency>
192 <dependency> 192 <dependency>
193 <groupId>org.apache.jackrabbit</groupId> 193 <groupId>org.apache.jackrabbit</groupId>
194Index: jackrabbit-spi-commons/pom.xml 194Index: jackrabbit-spi-commons/pom.xml
195=================================================================== 195===================================================================
206 <artifactId>jackrabbit-spi-commons</artifactId> 206 <artifactId>jackrabbit-spi-commons</artifactId>
207--- 26,32 ---- 207--- 26,32 ----
208 <parent> 208 <parent>
209 <groupId>org.apache.jackrabbit</groupId> 209 <groupId>org.apache.jackrabbit</groupId>
210 <artifactId>jackrabbit-parent</artifactId> 210 <artifactId>jackrabbit-parent</artifactId>
211! <version>2.6.4-h1</version> 211! <version>2.6.4-h2</version>
212 <relativePath>../jackrabbit-parent/pom.xml</relativePath> 212 <relativePath>../jackrabbit-parent/pom.xml</relativePath>
213 </parent> 213 </parent>
214 <artifactId>jackrabbit-spi-commons</artifactId> 214 <artifactId>jackrabbit-spi-commons</artifactId>
215# 215#
216# REPO-182: store mixintypes also in persistent store 216# REPO-182: store mixintypes also in persistent store
929+ assertEquals(testPath + "/a[2]", a.getPath()); 929+ assertEquals(testPath + "/a[2]", a.getPath());
930+ assertEquals(testPath + "/a", b.getPath()); 930+ assertEquals(testPath + "/a", b.getPath());
931+ } 931+ }
932+ 932+
933 } 933 }
934Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java
935===================================================================
936*** jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java (revision 1536369)
937--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java (working copy)
938***************
939*** 429,468 ****
940 return getEffectiveNodeType(name);
941 }
942
943! if (!diff.isTrivial()) {
944!
945! // TODO Implement checkForConflictingContent()
946! // make sure existing content would not conflict
947! // with new node type definition
948! //checkForConflictingContent(ntd);
949! //
950! // unregister old node type definition
951! //internalUnregister(name);
952! // register new definition
953! //EffectiveNodeType entNew = internalRegister(ntd);
954! //
955! // persist modified node type definitions
956! //customNTDefs.remove(name);
957! //customNTDefs.add(ntd);
958! //persistCustomNodeTypeDefs(customNTDefs);
959! //
960! // notify listeners
961! //notifyReRegistered(name);
962! //return entNew;
963!
964! String message =
965! "The following node type change contains non-trivial changes."
966! + "Up until now only trivial changes are supported."
967! + " (see javadoc for "
968! + NodeTypeDefDiff.class.getName()
969! + "):\n" + diff.toString();
970! throw new RepositoryException(message);
971! }
972
973 /**
974- * the change is trivial and has no effect on current content
975- * (e.g. that would be the case when non-mandatory properties had
976- * been added);
977 * re-register node type definition and update caches &
978 * notify listeners on re-registration
979 */
980--- 429,439 ----
981 return getEffectiveNodeType(name);
982 }
983
984! // make sure existing content would not conflict
985! // with new node type definition
986! checkForConflictingContent(ntd, diff);
987
988 /**
989 * re-register node type definition and update caches &
990 * notify listeners on re-registration
991 */
992***************
993*** 949,968 ****
994 * the above checks/actions are absolutely necessary in order to
995 * guarantee integrity of repository content.
996 *
997 * @param ntd The node type definition replacing the former node type
998 * definition of the same name.
999 * @throws RepositoryException If there is conflicting content or if the
1000 * check failed for some other reason.
1001 */
1002! protected void checkForConflictingContent(QNodeTypeDefinition ntd)
1003 throws RepositoryException {
1004 /**
1005! * collect names of node types that have dependencies on the given
1006! * node type
1007 */
1008- //Set dependentNTs = getDependentNodeTypes(ntd.getName());
1009-
1010- throw new RepositoryException("not yet implemented");
1011 }
1012
1013 /**
1014--- 920,956 ----
1015 * the above checks/actions are absolutely necessary in order to
1016 * guarantee integrity of repository content.
1017 *
1018+ *
1019 * @param ntd The node type definition replacing the former node type
1020 * definition of the same name.
1021+ * @param diff
1022 * @throws RepositoryException If there is conflicting content or if the
1023 * check failed for some other reason.
1024 */
1025! protected void checkForConflictingContent(QNodeTypeDefinition ntd, final NodeTypeDefDiff diff)
1026 throws RepositoryException {
1027+
1028+ if (!diff.isTrivial()) {
1029+ /**
1030+ * collect names of node types that have dependencies on the given
1031+ * node type
1032+ */
1033+ //Set dependentNTs = getDependentNodeTypes(ntd.getName());
1034+
1035+ String message =
1036+ "The following node type change contains non-trivial changes."
1037+ + "Up until now only trivial changes are supported."
1038+ + " (see javadoc for "
1039+ + NodeTypeDefDiff.class.getName()
1040+ + "):\n" + diff.toString();
1041+ throw new RepositoryException(message);
1042+ }
1043+
1044 /**
1045! * the change is trivial and has no effect on current content
1046! * (e.g. that would be the case when non-mandatory properties had
1047! * been added);
1048 */
1049 }
1050
1051 /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines