[jboss-svn-commits] JBL Code SVN: r36068 - in labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects: src/main/java/org/jboss/community/magnolia/services/exceptions and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Nov 25 20:11:24 EST 2010
Author: unibrew
Date: 2010-11-25 20:11:23 -0500 (Thu, 25 Nov 2010)
New Revision: 36068
Modified:
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/.classpath
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/.project
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/pom.xml
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/exceptions/ProjectNavigationException.java
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/project/ProjectsServiceBean.java
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/ContentGetterByUUID.java
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/EnumHashMapValueExtractor.java
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/HasVisibleChildrenPages.java
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/VisibleChildrenPages.java
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/ws/MagnoliaWebService.java
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/resources/magnoliaAuthor/META-INF/MANIFEST.MF
labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/resources/magnoliaPublic/META-INF/MANIFEST.MF
Log:
[ORG-789] Changes to magnolia services to make them running under magnolia 4.3.8
Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/.classpath
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/.classpath 2010-11-25 18:57:03 UTC (rev 36067)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/.classpath 2010-11-26 01:11:23 UTC (rev 36068)
@@ -1,117 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" path="freemarkerTemplates"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/info/magnolia/magnolia-core/3.6.8/magnolia-core-3.6.8.jar" sourcepath="M2_REPO/info/magnolia/magnolia-core/3.6.8/magnolia-core-3.6.8-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3/commons-io-1.3.jar" sourcepath="M2_REPO/commons-io/commons-io/1.3/commons-io-1.3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.3/commons-pool-1.3.jar" sourcepath="M2_REPO/commons-pool/commons-pool/1.3/commons-pool-1.3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar" sourcepath="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0-sources.jar">
- <attributes>
- <attribute name="javadoc_location" value="jar:file://Users/rysiek/.m2/repository/javax/jcr/jcr/1.0/jcr-1.0-javadoc.jar!/"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/openwfe/openwfe-jcr/1.7.2.1/openwfe-jcr-1.7.2.1.jar" sourcepath="M2_REPO/org/openwfe/openwfe-jcr/1.7.2.1/openwfe-jcr-1.7.2.1-sources.jar">
- <attributes>
- <attribute name="javadoc_location" value="jar:file://Users/rysiek/.m2/repository/org/openwfe/openwfe-jcr/1.7.2.1/openwfe-jcr-1.7.2.1-javadoc.jar!/"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/openwfe/openwfe-applic/1.7.2.1/openwfe-applic-1.7.2.1.jar" sourcepath="M2_REPO/org/openwfe/openwfe-applic/1.7.2.1/openwfe-applic-1.7.2.1-sources.jar">
- <attributes>
- <attribute name="javadoc_location" value="jar:file://Users/rysiek/.m2/repository/org/openwfe/openwfe-applic/1.7.2.1/openwfe-applic-1.7.2.1-javadoc.jar!/"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar" sourcepath="M2_REPO/jdom/jdom/1.0/jdom-1.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar">
- <attributes>
- <attribute name="javadoc_location" value="jar:file://Users/rysiek/.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-javadoc.jar!/"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/freemarker/freemarker/2.3.16/freemarker-2.3.16.jar" sourcepath="M2_REPO/org/freemarker/freemarker/2.3.16/freemarker-2.3.16-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-chain/commons-chain/1.1/commons-chain-1.1.jar" sourcepath="M2_REPO/commons-chain/commons-chain/1.1/commons-chain-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar">
- <attributes>
- <attribute name="javadoc_location" value="jar:file://Users/rysiek/.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-javadoc.jar!/"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.6/commons-digester-1.6.jar" sourcepath="M2_REPO/commons-digester/commons-digester/1.6/commons-digester-1.6-sources.jar">
- <attributes>
- <attribute name="javadoc_location" value="jar:file://Users/rysiek/.m2/repository/commons-digester/commons-digester/1.6/commons-digester-1.6-javadoc.jar!/"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/safehaus/jug/jug/2.0.0/jug-2.0.0-asl.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.1/slf4j-api-1.4.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.4.1/slf4j-api-1.4.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.1/slf4j-log4j12-1.4.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.4.1/slf4j-log4j12-1.4.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl104-over-slf4j/1.4.1/jcl104-over-slf4j-1.4.1.jar" sourcepath="M2_REPO/org/slf4j/jcl104-over-slf4j/1.4.1/jcl104-over-slf4j-1.4.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.0-FCS/jaxen-1.0-FCS.jar" sourcepath="M2_REPO/jaxen/jaxen/1.0-FCS/jaxen-1.0-FCS-sources.jar">
- <attributes>
- <attribute name="javadoc_location" value="jar:file://Users/rysiek/.m2/repository/jaxen/jaxen/1.0-FCS/jaxen-1.0-FCS-javadoc.jar!/"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="M2_REPO/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS.jar" sourcepath="M2_REPO/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS-sources.jar">
- <attributes>
- <attribute name="javadoc_location" value="jar:file://Users/rysiek/.m2/repository/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS-javadoc.jar!/"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="M2_REPO/servlets/com/cos/05Nov2002/cos-05Nov2002.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar" sourcepath="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar">
- <attributes>
- <attribute name="javadoc_location" value="jar:file://Users/rysiek/.m2/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-javadoc.jar!/"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="M2_REPO/commons-betwixt/commons-betwixt/0.7/commons-betwixt-0.7.jar" sourcepath="M2_REPO/commons-betwixt/commons-betwixt/0.7/commons-betwixt-0.7-sources.jar">
- <attributes>
- <attribute name="javadoc_location" value="jar:file://Users/rysiek/.m2/repository/commons-betwixt/commons-betwixt/0.7/commons-betwixt-0.7-javadoc.jar!/"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar" sourcepath="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" sourcepath="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.4.5/jackrabbit-core-1.4.5.jar" sourcepath="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.4.5/jackrabbit-core-1.4.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar" sourcepath="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar" sourcepath="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar" sourcepath="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar" sourcepath="M2_REPO/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar" sourcepath="M2_REPO/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar" sourcepath="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar" sourcepath="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804-sources.jar">
- <attributes>
- <attribute name="javadoc_location" value="jar:file://Users/rysiek/.m2/repository/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804-javadoc.jar!/"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="M2_REPO/pdfbox/pdfbox/0.6.4/pdfbox-0.6.4.jar" sourcepath="M2_REPO/pdfbox/pdfbox/0.6.4/pdfbox-0.6.4-sources.jar">
- <attributes>
- <attribute name="javadoc_location" value="jar:file://Users/rysiek/.m2/repository/pdfbox/pdfbox/0.6.4/pdfbox-0.6.4-javadoc.jar!/"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/textmining/tm-extractors/0.4/tm-extractors-0.4.jar" sourcepath="M2_REPO/org/textmining/tm-extractors/0.4/tm-extractors-0.4-sources.jar">
- <attributes>
- <attribute name="javadoc_location" value="jar:file://Users/rysiek/.m2/repository/org/textmining/tm-extractors/0.4/tm-extractors-0.4-javadoc.jar!/"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="M2_REPO/nekohtml/nekohtml/0.9.4/nekohtml-0.9.4.jar" sourcepath="M2_REPO/nekohtml/nekohtml/0.9.4/nekohtml-0.9.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar" sourcepath="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/info/magnolia/magnolia-module-admininterface/3.6.8/magnolia-module-admininterface-3.6.8.jar" sourcepath="M2_REPO/info/magnolia/magnolia-module-admininterface/3.6.8/magnolia-module-admininterface-3.6.8-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/info/magnolia/magnolia-module-exchange-simple/3.6.8/magnolia-module-exchange-simple-3.6.8.jar" sourcepath="M2_REPO/info/magnolia/magnolia-module-exchange-simple/3.6.8/magnolia-module-exchange-simple-3.6.8-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/info/magnolia/magnolia-gui/3.6.8/magnolia-gui-3.6.8.jar" sourcepath="M2_REPO/info/magnolia/magnolia-gui/3.6.8/magnolia-gui-3.6.8-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/info/magnolia/magnolia-jaas/3.6.8/magnolia-jaas-3.6.8.jar" sourcepath="M2_REPO/info/magnolia/magnolia-jaas/3.6.8/magnolia-jaas-3.6.8-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/devlib/schmidt/imageinfo/1.7/imageinfo-1.7.jar" sourcepath="M2_REPO/org/devlib/schmidt/imageinfo/1.7/imageinfo-1.7-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/ejb/jboss-ejb-api_3.0_spec/1.0.0.Beta1/jboss-ejb-api_3.0_spec-1.0.0.Beta1.jar" sourcepath="M2_REPO/org/jboss/spec/javax/ejb/jboss-ejb-api_3.0_spec/1.0.0.Beta1/jboss-ejb-api_3.0_spec-1.0.0.Beta1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.0.Beta1/jboss-transaction-api_1.1_spec-1.0.0.Beta1.jar" sourcepath="M2_REPO/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.0.Beta1/jboss-transaction-api_1.1_spec-1.0.0.Beta1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-jaxrpc/3.0.4.GA/jbossws-native-jaxrpc-3.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/ws/native/jbossws-native-jaxrpc/3.0.4.GA/jbossws-native-jaxrpc-3.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-saaj/3.0.4.GA/jbossws-native-saaj-3.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/ws/native/jbossws-native-saaj/3.0.4.GA/jbossws-native-saaj-3.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/projectlombok/lombok/0.9.2/lombok-0.9.2.jar" sourcepath="M2_REPO/org/projectlombok/lombok/0.9.2/lombok-0.9.2-sources.jar"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/Magnolia 3.6.8 EAP 4.3"/>
- <classpathentry kind="lib" path="/Users/rysiek/Desktop/jboss-eap-4.3/jboss-as/server/default/deploy/magnoliaAuthor.ear/magnoliaAuthor.war/WEB-INF/lib/magnolia-module-sitedesigner-1.1.8.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/.project
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/.project 2010-11-25 18:57:03 UTC (rev 36067)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/.project 2010-11-26 01:11:23 UTC (rev 36068)
@@ -1,13 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>projects</name>
- <comment/>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
+ <name>projects</name>
+ <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+ <linkedResources>
+ <link>
+ <name>freemarkerTemplates</name>
+ <type>2</type>
+ <location>/home/rysiek/Work/freemarkerTemplates</location>
+ </link>
+ </linkedResources>
+</projectDescription>
Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/pom.xml 2010-11-25 18:57:03 UTC (rev 36067)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/pom.xml 2010-11-26 01:11:23 UTC (rev 36068)
@@ -1,86 +1,106 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
-<!-- <parent>
- <artifactId>integration</artifactId>
- <groupId>org.jboss.labs</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent> -->
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.labs</groupId>
- <artifactId>projects</artifactId>
- <packaging>jar</packaging>
- <version>1.0.0</version>
- <name>A EJB3/WS service module for JBoss.org community page</name>
- <url>http://www.jboss.org</url>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+ <!--
+ <parent> <artifactId>integration</artifactId>
+ <groupId>org.jboss.labs</groupId> <version>1.0-SNAPSHOT</version>
+ </parent>
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.labs</groupId>
+ <artifactId>projects</artifactId>
+ <packaging>jar</packaging>
+ <version>1.1.0</version>
+ <name>A EJB3/WS service module for JBoss.org community page</name>
+ <url>http://www.jboss.org</url>
- <properties>
- <magnoliaVersion>3.6.8</magnoliaVersion>
- </properties>
+ <properties>
+ <magnoliaVersion>4.3.8</magnoliaVersion>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>info.magnolia</groupId>
- <artifactId>magnolia-core</artifactId>
- <version>${magnoliaVersion}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <artifactId>magnolia-module-admininterface</artifactId>
- <groupId>info.magnolia</groupId>
- <version>3.6.8</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.ejb</groupId>
- <artifactId>jboss-ejb-api_3.0_spec</artifactId>
- <version>1.0.0.Beta1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.16</version>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>0.9.2</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-core</artifactId>
+ <version>${magnoliaVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <artifactId>magnolia-module-admininterface</artifactId>
+ <groupId>info.magnolia</groupId>
+ <version>${magnoliaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.0_spec</artifactId>
+ <version>1.0.0.Beta1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.16</version>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>0.9.2</version>
+ </dependency>
+ </dependencies>
- <repositories>
- <repository>
- <id>magnolia</id>
- <url>http://svn.magnolia.info/maven/m2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>projectlombok.org</id>
- <url>http://projectlombok.org/mavenrepo</url>
- </repository>
- </repositories>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <archive>
- <manifestFile>src/main/resources/magnoliaAuthor/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <repositories>
+ <repository>
+ <id>magnolia</id>
+ <url>http://svn.magnolia.info/maven/m2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>projectlombok.org</id>
+ <url>http://projectlombok.org/mavenrepo</url>
+ </repository>
+ </repositories>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+ <manifestFile>src/main/resources/magnoliaAuthor/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>publicInstanceJar</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+ <manifestFile>src/main/resources/magnoliaPublic/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/exceptions/ProjectNavigationException.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/exceptions/ProjectNavigationException.java 2010-11-25 18:57:03 UTC (rev 36067)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/exceptions/ProjectNavigationException.java 2010-11-26 01:11:23 UTC (rev 36068)
@@ -3,8 +3,6 @@
*/
package org.jboss.community.magnolia.services.exceptions;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.ws.WebFault;
/**
* @author Ryszard Kozmik <rkozmik at redhat.com>
Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/project/ProjectsServiceBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/project/ProjectsServiceBean.java 2010-11-25 18:57:03 UTC (rev 36067)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/project/ProjectsServiceBean.java 2010-11-26 01:11:23 UTC (rev 36068)
@@ -1,14 +1,12 @@
package org.jboss.community.magnolia.services.project;
+import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.DefaultContent;
-import info.magnolia.cms.core.DefaultNodeData;
import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.NodeData;
import info.magnolia.cms.core.search.Query;
import info.magnolia.cms.core.search.QueryManager;
import info.magnolia.cms.core.search.QueryResult;
-import info.magnolia.cms.link.LinkHelper;
-import info.magnolia.cms.link.LinkResolver;
-import info.magnolia.cms.util.LinkUtil;
import info.magnolia.context.Context;
import info.magnolia.context.MgnlContext;
@@ -54,7 +52,7 @@
Query projectQuery = websiteQM.createQuery(getQueryStatementVer1(idName,parentIdName), info.magnolia.cms.core.search.Query.SQL);
QueryResult queryResult = projectQuery.execute();
- Collection<DefaultContent> projectNodes = queryResult.getContent("mgnl:contentNode");
+ Collection<Content> projectNodes = queryResult.getContent("mgnl:contentNode");
HashMap<ProjectProperty,String> projectProperties = new HashMap<ProjectProperty,String>();
if (!projectNodes.isEmpty()) {
extractQueryResults(projectNodes, projectProperties, websiteHM);
@@ -86,10 +84,10 @@
return null;
}
- private void extractQueryResults (Collection<DefaultContent> projectNodes,HashMap<ProjectProperty,String> projectProperties,HierarchyManager websiteHM) throws ValueFormatException, IllegalStateException, RepositoryException {
- DefaultContent projectNode = projectNodes.iterator().next();
- Collection<DefaultNodeData> properties = projectNode.getNodeDataCollection();
- for (DefaultNodeData projectProperty : properties) {
+ private void extractQueryResults (Collection<Content> projectNodes,HashMap<ProjectProperty,String> projectProperties,HierarchyManager websiteHM) throws ValueFormatException, IllegalStateException, RepositoryException {
+ Content projectNode = projectNodes.iterator().next();
+ Collection<NodeData> properties = projectNode.getNodeDataCollection();
+ for (NodeData projectProperty : properties) {
String handle = projectProperty.getHandle();
String projectPropertyName = projectProperty.getName();
ProjectProperty propertyEnum = ProjectProperty.BUILD_LINK.getPropertyByKey(projectPropertyName);
Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/ContentGetterByUUID.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/ContentGetterByUUID.java 2010-11-25 18:57:03 UTC (rev 36067)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/ContentGetterByUUID.java 2010-11-26 01:11:23 UTC (rev 36068)
@@ -20,6 +20,7 @@
*/
public class ContentGetterByUUID implements TemplateMethodModelEx {
+ @SuppressWarnings(value="unchecked")
public Object exec(List arguments) throws TemplateModelException {
if (arguments.size() != 2) {
throw new TemplateModelException("Wrong number of arguments.");
Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/EnumHashMapValueExtractor.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/EnumHashMapValueExtractor.java 2010-11-25 18:57:03 UTC (rev 36067)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/EnumHashMapValueExtractor.java 2010-11-26 01:11:23 UTC (rev 36068)
@@ -18,6 +18,7 @@
*/
public class EnumHashMapValueExtractor implements TemplateMethodModelEx {
+ @SuppressWarnings(value="unchecked")
public Object exec(List arguments) throws TemplateModelException {
if (arguments.size() != 2) {
throw new TemplateModelException("Wrong number of arguments.");
Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/HasVisibleChildrenPages.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/HasVisibleChildrenPages.java 2010-11-25 18:57:03 UTC (rev 36067)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/HasVisibleChildrenPages.java 2010-11-26 01:11:23 UTC (rev 36068)
@@ -1,7 +1,6 @@
package org.jboss.community.magnolia.services.utils;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.DefaultContent;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.NodeData;
@@ -27,6 +26,7 @@
Logger log = Logger.getLogger(HasVisibleChildrenPages.class);
+ @SuppressWarnings(value="unchecked")
public Object exec(List arguments) throws TemplateModelException {
if (arguments.size() != 2) {
throw new TemplateModelException("Wrong number of arguments.");
@@ -41,8 +41,8 @@
HierarchyManager websiteHM = (HierarchyManager)((StringModel)arguments.get(1)).getWrappedObject();
try {
Content parentPage = websiteHM.getContentByUUID(parentPageUUID);
- Collection<DefaultContent> pages = parentPage.getChildren(ItemType.CONTENT);
- for (DefaultContent page : pages) {
+ Collection<Content> pages = parentPage.getChildren(ItemType.CONTENT);
+ for (Content page : pages) {
NodeData nd = page.getNodeData("hideInNav");
if (nd==null || !nd.getBoolean()) {
return true;
Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/VisibleChildrenPages.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/VisibleChildrenPages.java 2010-11-25 18:57:03 UTC (rev 36067)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/utils/VisibleChildrenPages.java 2010-11-26 01:11:23 UTC (rev 36068)
@@ -4,7 +4,6 @@
package org.jboss.community.magnolia.services.utils;
import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.DefaultContent;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.core.NodeData;
@@ -29,17 +28,18 @@
Logger log = Logger.getLogger(VisibleChildrenPages.class);
+ @SuppressWarnings(value = "unchecked")
public Object exec(List arguments) throws TemplateModelException {
if (arguments.size() != 2) {
throw new TemplateModelException("Wrong number of arguments.");
}
String parentPageUUID = arguments.get(0).toString();
HierarchyManager websiteHM = (HierarchyManager)((StringModel)arguments.get(1)).getWrappedObject();
- List<DefaultContent> pagesToDisplay = new ArrayList<DefaultContent>();
+ List<Content> pagesToDisplay = new ArrayList<Content>();
try {
Content parentPage = websiteHM.getContentByUUID(parentPageUUID);
- Collection<DefaultContent> pages = parentPage.getChildren(ItemType.CONTENT);
- for (DefaultContent page : pages) {
+ Collection<Content> pages = parentPage.getChildren(ItemType.CONTENT);
+ for (Content page : pages) {
NodeData nd = page.getNodeData("hideInNav");
if (nd==null || !nd.getBoolean()) {
pagesToDisplay.add(page);
Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/ws/MagnoliaWebService.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/ws/MagnoliaWebService.java 2010-11-25 18:57:03 UTC (rev 36067)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/java/org/jboss/community/magnolia/services/ws/MagnoliaWebService.java 2010-11-26 01:11:23 UTC (rev 36068)
@@ -7,7 +7,6 @@
import javax.jws.WebParam;
import javax.jws.WebService;
-import org.jboss.community.magnolia.services.exceptions.ProjectServiceException;
import org.jboss.community.project.Project;
Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/resources/magnoliaAuthor/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/resources/magnoliaAuthor/META-INF/MANIFEST.MF 2010-11-25 18:57:03 UTC (rev 36067)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/resources/magnoliaAuthor/META-INF/MANIFEST.MF 2010-11-26 01:11:23 UTC (rev 36068)
@@ -1,2 +1,2 @@
Manifest-Version: 1.0
-Class-Path: magnoliaAuthor.war/WEB-INF/lib/jcr-1.0.jar magnoliaAuthor.war/WEB-INF/lib/magnolia-core-3.6.8.jar magnoliaAuthor.war/WEB-INF/lib/commons-chain-1.1.jar magnoliaAuthor.war/WEB-INF/lib/slf4j-api-1.4.1.jar magnoliaAuthor.war/WEB-INF/lib/slf4j-log4j12-1.4.1.jar magnoliaAuthor.war/WEB-INF/lib/commons-lang-2.3.jar magnoliaAuthor.war/WEB-INF/lib/freemarker-2.3.16.jar magnoliaAuthor.war/WEB-INF/lib/xercesImpl-2.8.1.jar
+Class-Path: magnoliaAuthor.war/WEB-INF/lib/jcr-1.0.jar magnoliaAuthor.war/WEB-INF/lib/magnolia-core-4.3.8.jar magnoliaAuthor.war/WEB-INF/lib/commons-chain-1.2.jar magnoliaAuthor.war/WEB-INF/lib/slf4j-api-1.5.11.jar magnoliaAuthor.war/WEB-INF/lib/slf4j-log4j12-1.5.11.jar magnoliaAuthor.war/WEB-INF/lib/commons-lang-2.4.jar magnoliaAuthor.war/WEB-INF/lib/freemarker-2.3.16.jar magnoliaAuthor.war/WEB-INF/lib/xercesImpl-2.8.1.jar
Modified: labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/resources/magnoliaPublic/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/resources/magnoliaPublic/META-INF/MANIFEST.MF 2010-11-25 18:57:03 UTC (rev 36067)
+++ labs/jbosslabs/labs-3.0-build/integration/mgnl-services/projects/src/main/resources/magnoliaPublic/META-INF/MANIFEST.MF 2010-11-26 01:11:23 UTC (rev 36068)
@@ -1,2 +1,2 @@
Manifest-Version: 1.0
-Class-Path: magnoliaPublic.war/WEB-INF/lib/jcr-1.0.jar magnoliaPublic.war/WEB-INF/lib/magnolia-core-3.6.8.jar magnoliaPublic.war/WEB-INF/lib/commons-chain-1.1.jar magnoliaPublic.war/WEB-INF/lib/slf4j-api-1.4.1.jar magnoliaPublic.war/WEB-INF/lib/slf4j-log4j12-1.4.1.jar magnoliaPublic.war/WEB-INF/lib/commons-lang-2.3.jar magnoliaPublic.war/WEB-INF/lib/freemarker-2.3.16.jar magnoliaPublic.war/WEB-INF/lib/xercesImpl-2.8.1.jar
+Class-Path: magnoliaPublic.war/WEB-INF/lib/jcr-1.0.jar magnoliaPublic.war/WEB-INF/lib/magnolia-core-4.3.8.jar magnoliaPublic.war/WEB-INF/lib/commons-chain-1.2.jar magnoliaPublic.war/WEB-INF/lib/slf4j-api-1.5.11.jar magnoliaPublic.war/WEB-INF/lib/slf4j-log4j12-1.5.11.jar magnoliaPublic.war/WEB-INF/lib/commons-lang-2.4.jar magnoliaPublic.war/WEB-INF/lib/freemarker-2.3.16.jar magnoliaPublic.war/WEB-INF/lib/xercesImpl-2.8.1.jar
More information about the jboss-svn-commits
mailing list