Author: brett
Date: Fri Jan 6 04:06:00 2006
New Revision: 366487
URL: http://svn.apache.org/viewcvs?rev=366487&view=rev
Log:
[MSITE-62] don't do the .. resolution. Found to be confusing locally.
Modified:
maven/doxia/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
maven/doxia/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
Modified:
maven/doxia/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java?rev=366487&r1=366486&r2=366487&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
(original)
+++
maven/doxia/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
Fri Jan 6 04:06:00 2006
@@ -319,6 +319,7 @@
{
prefix = getRelativePath( parentUrl, childUrl );
}
+/*
else
{
String[] parentSplit = splitUrl( parentUrl );
@@ -351,6 +352,7 @@
}
}
}
+*/
return prefix;
}
Modified:
maven/doxia/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java?rev=366487&r1=366486&r2=366487&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
(original)
+++
maven/doxia/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
Fri Jan 6 04:06:00 2006
@@ -345,6 +345,7 @@
assertEquals( "Check result", resolvedModel, model );
}
+/*
public void testResolvingAllSiteChildUrls()
throws IOException, XmlPullParserException
{
@@ -377,6 +378,8 @@
DecorationModel resolvedModel = readModel(
"subsite-relative-urls-resolved.xml" );
assertEquals( "Check result", resolvedModel, model );
}
+
+*/
public void testResolvingEmptyDescriptor()
throws IOException, XmlPullParserException
