Author: scottbw
Date: Thu Jun 16 07:56:44 2011
New Revision: 1136313
URL: http://svn.apache.org/viewvc?rev=1136313&view=rev
Log:
Fixed a few issues with the JCR module that were preventing it from building
correctly
Modified:
incubator/wookie/trunk/modules/jcr/build.xml
incubator/wookie/trunk/modules/jcr/ivy.xml
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/AuthorImpl.java
Modified: incubator/wookie/trunk/modules/jcr/build.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/build.xml?rev=1136313&r1=1136312&r2=1136313&view=diff
==============================================================================
--- incubator/wookie/trunk/modules/jcr/build.xml (original)
+++ incubator/wookie/trunk/modules/jcr/build.xml Thu Jun 16 07:56:44 2011
@@ -35,10 +35,7 @@
<target name="pre-compile-core" description="Run before compile-core.
intended to be overridden if your project needs any post compile processing"/>
<target name="deploy-module" depends="publish-local">
- <ivy:cachepath pathid="project.core.class.path" conf="dev" />
- <copy file="dist/wookie-jcr-0.1.0-SNAPSHOT.jar"
todir="../../${servletEngine.webapp.dir}/${ant.project.name}/WEB-INF/lib"></copy>
-
- <ivy:retrieve conf="deploy"
pattern="../../${servletEngine.webapp.dir}/${ant.project.name}/WEB-INF/lib/[artifact]-[revision].[ext]"/>
-
+ <ivy:cachepath pathid="project.core.class.path" conf="*"/>
+ <ivy:retrieve conf="deploy"
pattern="../../${servletEngine.webapp.dir}/wookie/WEB-INF/lib/[artifact]-[revision].[ext]"/>
</target>
</project>
\ No newline at end of file
Modified: incubator/wookie/trunk/modules/jcr/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/ivy.xml?rev=1136313&r1=1136312&r2=1136313&view=diff
==============================================================================
--- incubator/wookie/trunk/modules/jcr/ivy.xml (original)
+++ incubator/wookie/trunk/modules/jcr/ivy.xml Thu Jun 16 07:56:44 2011
@@ -26,6 +26,8 @@
<dependencies>
<dependency org="org.apache.incubator" name="wookie"
rev="latest.integration" conf="deploy->default">
</dependency>
+ <dependency org="org.apache.incubator" name="wookie-parser"
rev="latest.integration" conf="deploy->default">
+ </dependency>
<dependency org="commons-pool" name="commons-pool" rev="1.3"
conf="deploy->default">
</dependency>
<dependency org="commons-configuration"
name="commons-configuration" rev="1.4" conf="deploy->default">
Modified:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/AuthorImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/AuthorImpl.java?rev=1136313&r1=1136312&r2=1136313&view=diff
==============================================================================
---
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/AuthorImpl.java
(original)
+++
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/AuthorImpl.java
Thu Jun 16 07:56:44 2011
@@ -17,6 +17,7 @@ import org.apache.jackrabbit.ocm.mapper.
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
import org.apache.wookie.beans.IAuthor;
import org.apache.wookie.beans.jcr.IIdElement;
+import org.apache.wookie.w3c.ILocalizedElement;
/**
* JCR Implementation of Author bean
