[exo-jcr-commits] exo-jcr SVN: r5698 - in core/branches/2.5.x: exo.core.component.database and 11 other directories.

Author: andrew.plotnikov Date: 2012-02-24 09:04:44 -0500 (Fri, 24 Feb 2012) New Revision: 5698 Added: core/branches/2.5.x/exo.core.component.document/src/test/resources/tsm-excludes.properties Modified: core/branches/2.5.x/exo.core.component.database/pom.xml core/branches/2.5.x/exo.core.component.document/pom.xml core/branches/2.5.x/exo.core.component.ldap/pom.xml core/branches/2.5.x/exo.core.component.organization.api/pom.xml core/branches/2.5.x/exo.core.component.organization.jdbc/pom.xml core/branches/2.5.x/exo.core.component.organization.ldap/pom.xml core/branches/2.5.x/exo.core.component.organization.tests/pom.xml core/branches/2.5.x/exo.core.component.script.groovy/pom.xml core/branches/2.5.x/exo.core.component.security.core/pom.xml core/branches/2.5.x/exo.core.component.web.css/pom.xml core/branches/2.5.x/exo.core.component.xml-processing/pom.xml core/branches/2.5.x/pom.xml Log: EXOJCR-1771: Checked the scope and the dependency list of each project Modified: core/branches/2.5.x/exo.core.component.database/pom.xml =================================================================== --- core/branches/2.5.x/exo.core.component.database/pom.xml 2012-02-24 11:00:36 UTC (rev 5697) +++ core/branches/2.5.x/exo.core.component.database/pom.xml 2012-02-24 14:04:44 UTC (rev 5698) @@ -40,11 +40,6 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - - <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.common</artifactId> </dependency> @@ -116,6 +111,15 @@ <groupId>commons-pool</groupId> <artifactId>commons-pool</artifactId> </dependency> + + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> + <dependency> + <groupId>org.ow2.spec.ee</groupId> + <artifactId>ow2-jta-1.1-spec</artifactId> + </dependency> </dependencies> <build> @@ -134,7 +138,7 @@ <id>prepare-test-policy</id> <phase>process-test-resources</phase> <configuration> - <tasks> + <target> <echo>Creating Access Policy for tests</echo> <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> @@ -149,7 +153,7 @@ <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> </filterset> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> Modified: core/branches/2.5.x/exo.core.component.document/pom.xml =================================================================== --- core/branches/2.5.x/exo.core.component.document/pom.xml 2012-02-24 11:00:36 UTC (rev 5697) +++ core/branches/2.5.x/exo.core.component.document/pom.xml 2012-02-24 14:04:44 UTC (rev 5698) @@ -47,10 +47,6 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> </dependency> @@ -90,16 +86,29 @@ </exclusions> </dependency> - <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-core</artifactId> - </dependency> + <dependency> + <groupId>org.apache.tika</groupId> + <artifactId>tika-core</artifactId> + </dependency> - <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-parsers</artifactId> - </dependency> + <dependency> + <groupId>org.apache.tika</groupId> + <artifactId>tika-parsers</artifactId> + </dependency> + <dependency> + <groupId>org.apache.xmlbeans</groupId> + <artifactId>xmlbeans</artifactId> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>jempbox</artifactId> + </dependency> + </dependencies> <build> <testResources> @@ -189,7 +198,7 @@ <id>prepare-test-policy</id> <phase>process-test-resources</phase> <configuration> - <tasks> + <target> <echo>Creating Access Policy for tests</echo> <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> @@ -204,7 +213,7 @@ <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> </filterset> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> Added: core/branches/2.5.x/exo.core.component.document/src/test/resources/tsm-excludes.properties =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/test/resources/tsm-excludes.properties (rev 0) +++ core/branches/2.5.x/exo.core.component.document/src/test/resources/tsm-excludes.properties 2012-02-24 14:04:44 UTC (rev 5698) @@ -0,0 +1,4 @@ +org.exoplatform.services.document.test.TestMSXExcelDocumentReader.testGetContentAsString=getContentAsText +org.exoplatform.services.document.test.TestPropertiesExtracting.testXWordDocumentReaderService=getProperties +org.exoplatform.services.document.test.TestPropertiesExtracting.testXPPTDocumentReaderService=getProperties +org.exoplatform.services.document.test.TestPropertiesExtracting.testXExcelDocumentReaderService=getProperties \ No newline at end of file Modified: core/branches/2.5.x/exo.core.component.ldap/pom.xml =================================================================== --- core/branches/2.5.x/exo.core.component.ldap/pom.xml 2012-02-24 11:00:36 UTC (rev 5697) +++ core/branches/2.5.x/exo.core.component.ldap/pom.xml 2012-02-24 14:04:44 UTC (rev 5698) @@ -82,7 +82,7 @@ <id>prepare-test-policy</id> <phase>process-test-resources</phase> <configuration> - <tasks> + <target> <echo>Creating Access Policy for tests</echo> <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> @@ -97,7 +97,7 @@ <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> </filterset> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> Modified: core/branches/2.5.x/exo.core.component.organization.api/pom.xml =================================================================== --- core/branches/2.5.x/exo.core.component.organization.api/pom.xml 2012-02-24 11:00:36 UTC (rev 5697) +++ core/branches/2.5.x/exo.core.component.organization.api/pom.xml 2012-02-24 14:04:44 UTC (rev 5698) @@ -69,10 +69,6 @@ <groupId>picocontainer</groupId> <artifactId>picocontainer</artifactId> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> </dependencies> <build> <testResources> @@ -107,7 +103,7 @@ <execution> <phase>compile</phase> <configuration> - <tasks> + <target> <taskdef name="hibernatedoclet" classname="xdoclet.modules.hibernate.HibernateDocletTask" classpathref="maven.dependency.classpath" /> <hibernatedoclet destdir="${basedir}/target/classes" excludedtags="@version,@author,@todo" mergedir="target/classes" force="true" verbose="false"> <fileset dir="${basedir}/src/main/java"> @@ -119,7 +115,7 @@ </fileset> <hibernate version="3.0" /> </hibernatedoclet> - </tasks> + </target> </configuration> <goals> <goal>run</goal> Modified: core/branches/2.5.x/exo.core.component.organization.jdbc/pom.xml =================================================================== --- core/branches/2.5.x/exo.core.component.organization.jdbc/pom.xml 2012-02-24 11:00:36 UTC (rev 5697) +++ core/branches/2.5.x/exo.core.component.organization.jdbc/pom.xml 2012-02-24 14:04:44 UTC (rev 5698) @@ -35,10 +35,6 @@ <dependencies> <dependency> - <groupId>org.exoplatform.tool</groupId> - <artifactId>exo.tool.framework.junit</artifactId> - </dependency> - <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.common</artifactId> </dependency> @@ -79,12 +75,6 @@ <artifactId>exo.core.component.organization.api</artifactId> </dependency> <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.tests</artifactId> - <classifier>test-sources</classifier> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> </dependency> @@ -98,6 +88,14 @@ <artifactId>javassist</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + </dependency> </dependencies> <build> @@ -237,7 +235,7 @@ <id>prepare-test-policy</id> <phase>process-test-resources</phase> <configuration> - <tasks> + <target> <echo>Creating Access Policy for tests</echo> <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> @@ -252,7 +250,7 @@ <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> </filterset> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> Modified: core/branches/2.5.x/exo.core.component.organization.ldap/pom.xml =================================================================== --- core/branches/2.5.x/exo.core.component.organization.ldap/pom.xml 2012-02-24 11:00:36 UTC (rev 5697) +++ core/branches/2.5.x/exo.core.component.organization.ldap/pom.xml 2012-02-24 14:04:44 UTC (rev 5698) @@ -85,6 +85,15 @@ <artifactId>hsqldb</artifactId> <groupId>org.hsqldb</groupId> </dependency> + <dependency> + <artifactId>commons-io</artifactId> + <groupId>commons-io</groupId> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + </dependency> + </dependencies> <build> @@ -185,7 +194,7 @@ <id>prepare-test-policy</id> <phase>process-test-resources</phase> <configuration> - <tasks> + <target> <echo>Creating Access Policy for tests</echo> <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> @@ -200,7 +209,7 @@ <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> </filterset> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> Modified: core/branches/2.5.x/exo.core.component.organization.tests/pom.xml =================================================================== --- core/branches/2.5.x/exo.core.component.organization.tests/pom.xml 2012-02-24 11:00:36 UTC (rev 5697) +++ core/branches/2.5.x/exo.core.component.organization.tests/pom.xml 2012-02-24 14:04:44 UTC (rev 5698) @@ -50,7 +50,7 @@ <executions> <execution> <id>attach-sources</id> - <phase>package</phase> + <phase>generate-sources</phase> <goals> <goal>test-jar-no-fork</goal> </goals> Modified: core/branches/2.5.x/exo.core.component.script.groovy/pom.xml =================================================================== --- core/branches/2.5.x/exo.core.component.script.groovy/pom.xml 2012-02-24 11:00:36 UTC (rev 5697) +++ core/branches/2.5.x/exo.core.component.script.groovy/pom.xml 2012-02-24 14:04:44 UTC (rev 5698) @@ -68,7 +68,7 @@ <id>prepare-test-policy</id> <phase>process-test-resources</phase> <configuration> - <tasks> + <target> <echo>Creating Access Policy for tests</echo> <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> @@ -83,7 +83,7 @@ <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> </filterset> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> Modified: core/branches/2.5.x/exo.core.component.security.core/pom.xml =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/pom.xml 2012-02-24 11:00:36 UTC (rev 5697) +++ core/branches/2.5.x/exo.core.component.security.core/pom.xml 2012-02-24 14:04:44 UTC (rev 5698) @@ -79,7 +79,7 @@ <id>prepare-test-policy</id> <phase>process-test-resources</phase> <configuration> - <tasks> + <target> <echo>Creating Access Policy for tests</echo> <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> @@ -94,7 +94,7 @@ <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> </filterset> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> Modified: core/branches/2.5.x/exo.core.component.web.css/pom.xml =================================================================== --- core/branches/2.5.x/exo.core.component.web.css/pom.xml 2012-02-24 11:00:36 UTC (rev 5697) +++ core/branches/2.5.x/exo.core.component.web.css/pom.xml 2012-02-24 14:04:44 UTC (rev 5698) @@ -69,7 +69,7 @@ <id>prepare-test-policy</id> <phase>process-test-resources</phase> <configuration> - <tasks> + <target> <echo>Creating Access Policy for tests</echo> <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> @@ -84,7 +84,7 @@ <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> </filterset> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> Modified: core/branches/2.5.x/exo.core.component.xml-processing/pom.xml =================================================================== --- core/branches/2.5.x/exo.core.component.xml-processing/pom.xml 2012-02-24 11:00:36 UTC (rev 5697) +++ core/branches/2.5.x/exo.core.component.xml-processing/pom.xml 2012-02-24 14:04:44 UTC (rev 5698) @@ -116,7 +116,7 @@ <id>prepare-test-policy</id> <phase>process-test-resources</phase> <configuration> - <tasks> + <target> <echo>Creating Access Policy for tests</echo> <makeurl file="${settings.localRepository}" property="localRepositoryURL" /> <makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" /> @@ -131,7 +131,7 @@ <filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" /> </filterset> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> Modified: core/branches/2.5.x/pom.xml =================================================================== --- core/branches/2.5.x/pom.xml 2012-02-24 11:00:36 UTC (rev 5697) +++ core/branches/2.5.x/pom.xml 2012-02-24 14:04:44 UTC (rev 5698) @@ -216,13 +216,6 @@ <artifactId>commons-lang</artifactId> <version>2.6</version> </dependency> - - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>2.0.0</version> - <scope>test</scope> - </dependency> <dependency> <groupId>com.experlog</groupId> @@ -361,28 +354,52 @@ <artifactId>commons-pool</artifactId> <version>1.5.5</version> </dependency> - + <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.14.0-GA</version> + <groupId>org.apache.tika</groupId> + <artifactId>tika-core</artifactId> + <version>0.7</version> </dependency> - <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-core</artifactId> - <version>0.7</version> - </dependency> + <dependency> + <groupId>org.apache.tika</groupId> + <artifactId>tika-parsers</artifactId> + <version>0.7</version> + </dependency> - <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-parsers</artifactId> - <version>0.7</version> - </dependency> + <dependency> + <groupId>org.apache.xmlbeans</groupId> + <artifactId>xmlbeans</artifactId> + <version>2.3.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.0.b2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>jempbox</artifactId> + <version>1.6.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.ow2.spec.ee</groupId> + <artifactId>ow2-jta-1.1-spec</artifactId> + <version>1.0-M1</version> + <scope>compile</scope> + </dependency> + <dependency> + <artifactId>commons-io</artifactId> + <groupId>commons-io</groupId> + <version>1.2</version> + <scope>test</scope> + </dependency> - </dependencies> </dependencyManagement>