directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r985859 - in /directory/studio/trunk: ./ apacheds.configuration.feature/ apacheds.configuration.help/ apacheds.feature/ apacheds.help/ application/ features/ features/apacheds.configuration.feature/ features/apacheds.feature/ features/ldapb...
Date Mon, 16 Aug 2010 10:30:04 GMT
Author: pamarcelot
Date: Mon Aug 16 10:30:03 2010
New Revision: 985859

URL: http://svn.apache.org/viewvc?rev=985859&view=rev
Log:
Moved help, features and test plugin projects into their corresponding folders.

Added:
    directory/studio/trunk/features/apacheds.configuration.feature/
      - copied from r984798, directory/studio/trunk/apacheds.configuration.feature/
    directory/studio/trunk/features/apacheds.configuration.feature/feature.xml
      - copied unchanged from r985164, directory/studio/trunk/apacheds.configuration.feature/feature.xml
    directory/studio/trunk/features/apacheds.feature/
      - copied from r984798, directory/studio/trunk/apacheds.feature/
    directory/studio/trunk/features/apacheds.feature/feature.xml
      - copied unchanged from r985164, directory/studio/trunk/apacheds.feature/feature.xml
    directory/studio/trunk/features/ldapbrowser.feature/
      - copied from r984798, directory/studio/trunk/ldapbrowser.feature/
    directory/studio/trunk/features/ldapbrowser.feature/feature.xml
      - copied unchanged from r985164, directory/studio/trunk/ldapbrowser.feature/feature.xml
    directory/studio/trunk/features/ldifeditor.feature/
      - copied from r984798, directory/studio/trunk/ldifeditor.feature/
    directory/studio/trunk/features/ldifeditor.feature/feature.xml
      - copied unchanged from r985164, directory/studio/trunk/ldifeditor.feature/feature.xml
    directory/studio/trunk/features/pom.xml
    directory/studio/trunk/features/rcp.feature/
      - copied from r984798, directory/studio/trunk/rcp.feature/
    directory/studio/trunk/features/rcp.feature/feature.xml
      - copied unchanged from r985164, directory/studio/trunk/rcp.feature/feature.xml
    directory/studio/trunk/features/schemaeditor.feature/
      - copied from r984798, directory/studio/trunk/schemaeditor.feature/
    directory/studio/trunk/features/schemaeditor.feature/feature.xml
      - copied unchanged from r985164, directory/studio/trunk/schemaeditor.feature/feature.xml
    directory/studio/trunk/helps/apacheds.configuration.help/
      - copied from r984798, directory/studio/trunk/apacheds.configuration.help/
    directory/studio/trunk/helps/apacheds.help/
      - copied from r984798, directory/studio/trunk/apacheds.help/
    directory/studio/trunk/helps/ldapbrowser.help/
      - copied from r984798, directory/studio/trunk/ldapbrowser.help/
    directory/studio/trunk/helps/ldifeditor.help/
      - copied from r984798, directory/studio/trunk/ldifeditor.help/
    directory/studio/trunk/helps/pom.xml
    directory/studio/trunk/helps/rcp.help/
      - copied from r984798, directory/studio/trunk/rcp.help/
    directory/studio/trunk/helps/schemaeditor.help/
      - copied from r984798, directory/studio/trunk/schemaeditor.help/
    directory/studio/trunk/tests/pom.xml
    directory/studio/trunk/tests/test.integration.core/
      - copied from r984798, directory/studio/trunk/test.integration.core/
    directory/studio/trunk/tests/test.integration.ui/
      - copied from r984798, directory/studio/trunk/test.integration.ui/
    directory/studio/trunk/tests/test.integration.ui/pom.xml
      - copied, changed from r985168, directory/studio/trunk/test.integration.ui/pom.xml
Removed:
    directory/studio/trunk/apacheds.configuration.feature/
    directory/studio/trunk/apacheds.configuration.help/
    directory/studio/trunk/apacheds.feature/
    directory/studio/trunk/apacheds.help/
    directory/studio/trunk/help-pom.xml
    directory/studio/trunk/ldapbrowser.feature/
    directory/studio/trunk/ldapbrowser.help/
    directory/studio/trunk/ldifeditor.feature/
    directory/studio/trunk/ldifeditor.help/
    directory/studio/trunk/rcp.feature/
    directory/studio/trunk/rcp.help/
    directory/studio/trunk/schemaeditor.feature/
    directory/studio/trunk/schemaeditor.help/
    directory/studio/trunk/test.integration.core/
    directory/studio/trunk/test.integration.ui/
Modified:
    directory/studio/trunk/application/pom.xml
    directory/studio/trunk/features/apacheds.configuration.feature/pom.xml
    directory/studio/trunk/features/apacheds.feature/pom.xml
    directory/studio/trunk/features/ldapbrowser.feature/pom.xml
    directory/studio/trunk/features/ldifeditor.feature/pom.xml
    directory/studio/trunk/features/rcp.feature/pom.xml
    directory/studio/trunk/features/schemaeditor.feature/pom.xml
    directory/studio/trunk/helps/apacheds.configuration.help/pom.xml
    directory/studio/trunk/helps/apacheds.help/pom.xml
    directory/studio/trunk/helps/ldapbrowser.help/pom.xml
    directory/studio/trunk/helps/ldifeditor.help/pom.xml
    directory/studio/trunk/helps/rcp.help/pom.xml
    directory/studio/trunk/helps/schemaeditor.help/pom.xml
    directory/studio/trunk/pom.xml
    directory/studio/trunk/tests/test.integration.core/pom.xml

Modified: directory/studio/trunk/application/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/pom.xml?rev=985859&r1=985858&r2=985859&view=diff
==============================================================================
--- directory/studio/trunk/application/pom.xml (original)
+++ directory/studio/trunk/application/pom.xml Mon Aug 16 10:30:03 2010
@@ -35,8 +35,8 @@
   </properties>
   
   <modules>
-    <module>application-features</module>
     <module>application-plugins</module>
+    <module>application-features</module>
     <module>application-eclipse-plugins</module>
   </modules>
   

Modified: directory/studio/trunk/features/apacheds.configuration.feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/apacheds.configuration.feature/pom.xml?rev=985859&r1=984798&r2=985859&view=diff
==============================================================================
--- directory/studio/trunk/features/apacheds.configuration.feature/pom.xml (original)
+++ directory/studio/trunk/features/apacheds.configuration.feature/pom.xml Mon Aug 16 10:30:03
2010
@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.studio</groupId>
-    <artifactId>parent</artifactId>
+    <artifactId>parent-features</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   

Modified: directory/studio/trunk/features/apacheds.feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/apacheds.feature/pom.xml?rev=985859&r1=984798&r2=985859&view=diff
==============================================================================
--- directory/studio/trunk/features/apacheds.feature/pom.xml (original)
+++ directory/studio/trunk/features/apacheds.feature/pom.xml Mon Aug 16 10:30:03 2010
@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.studio</groupId>
-    <artifactId>parent</artifactId>
+    <artifactId>parent-features</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   

Modified: directory/studio/trunk/features/ldapbrowser.feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/ldapbrowser.feature/pom.xml?rev=985859&r1=984798&r2=985859&view=diff
==============================================================================
--- directory/studio/trunk/features/ldapbrowser.feature/pom.xml (original)
+++ directory/studio/trunk/features/ldapbrowser.feature/pom.xml Mon Aug 16 10:30:03 2010
@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.studio</groupId>
-    <artifactId>parent</artifactId>
+    <artifactId>parent-features</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   

Modified: directory/studio/trunk/features/ldifeditor.feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/ldifeditor.feature/pom.xml?rev=985859&r1=984798&r2=985859&view=diff
==============================================================================
--- directory/studio/trunk/features/ldifeditor.feature/pom.xml (original)
+++ directory/studio/trunk/features/ldifeditor.feature/pom.xml Mon Aug 16 10:30:03 2010
@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.studio</groupId>
-    <artifactId>parent</artifactId>
+    <artifactId>parent-features</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   

Added: directory/studio/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/pom.xml?rev=985859&view=auto
==============================================================================
--- directory/studio/trunk/features/pom.xml (added)
+++ directory/studio/trunk/features/pom.xml Mon Aug 16 10:30:03 2010
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--
+  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory.studio</groupId>
+    <artifactId>parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>parent-features</artifactId>
+  <name>Apache Directory Studio Feature Plugins</name>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>apacheds.configuration.feature</module>
+    <module>apacheds.feature</module>
+    <module>ldapbrowser.feature</module>
+    <module>ldifeditor.feature</module>
+    <module>rcp.feature</module>
+    <module>schemaeditor.feature</module>
+  </modules>
+  
+</project>

Modified: directory/studio/trunk/features/rcp.feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/rcp.feature/pom.xml?rev=985859&r1=984798&r2=985859&view=diff
==============================================================================
--- directory/studio/trunk/features/rcp.feature/pom.xml (original)
+++ directory/studio/trunk/features/rcp.feature/pom.xml Mon Aug 16 10:30:03 2010
@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.studio</groupId>
-    <artifactId>parent</artifactId>
+    <artifactId>parent-features</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   

Modified: directory/studio/trunk/features/schemaeditor.feature/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/schemaeditor.feature/pom.xml?rev=985859&r1=984798&r2=985859&view=diff
==============================================================================
--- directory/studio/trunk/features/schemaeditor.feature/pom.xml (original)
+++ directory/studio/trunk/features/schemaeditor.feature/pom.xml Mon Aug 16 10:30:03 2010
@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.studio</groupId>
-    <artifactId>parent</artifactId>
+    <artifactId>parent-features</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   

Modified: directory/studio/trunk/helps/apacheds.configuration.help/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/helps/apacheds.configuration.help/pom.xml?rev=985859&r1=984798&r2=985859&view=diff
==============================================================================
--- directory/studio/trunk/helps/apacheds.configuration.help/pom.xml (original)
+++ directory/studio/trunk/helps/apacheds.configuration.help/pom.xml Mon Aug 16 10:30:03 2010
@@ -22,9 +22,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.studio</groupId>
-    <artifactId>parent-help</artifactId>
+    <artifactId>parent-helps</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../help-pom.xml</relativePath>
   </parent>
 
   <artifactId>apacheds.configuration.help</artifactId>

Modified: directory/studio/trunk/helps/apacheds.help/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/helps/apacheds.help/pom.xml?rev=985859&r1=984798&r2=985859&view=diff
==============================================================================
--- directory/studio/trunk/helps/apacheds.help/pom.xml (original)
+++ directory/studio/trunk/helps/apacheds.help/pom.xml Mon Aug 16 10:30:03 2010
@@ -22,9 +22,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.studio</groupId>
-    <artifactId>parent-help</artifactId>
+    <artifactId>parent-helps</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../help-pom.xml</relativePath>
   </parent>
 
   <artifactId>apacheds.help</artifactId>

Modified: directory/studio/trunk/helps/ldapbrowser.help/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/helps/ldapbrowser.help/pom.xml?rev=985859&r1=984798&r2=985859&view=diff
==============================================================================
--- directory/studio/trunk/helps/ldapbrowser.help/pom.xml (original)
+++ directory/studio/trunk/helps/ldapbrowser.help/pom.xml Mon Aug 16 10:30:03 2010
@@ -22,9 +22,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.studio</groupId>
-    <artifactId>parent-help</artifactId>
+    <artifactId>parent-helps</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../help-pom.xml</relativePath>
   </parent>
 
   <artifactId>ldapbrowser.help</artifactId>

Modified: directory/studio/trunk/helps/ldifeditor.help/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/helps/ldifeditor.help/pom.xml?rev=985859&r1=984798&r2=985859&view=diff
==============================================================================
--- directory/studio/trunk/helps/ldifeditor.help/pom.xml (original)
+++ directory/studio/trunk/helps/ldifeditor.help/pom.xml Mon Aug 16 10:30:03 2010
@@ -22,9 +22,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.studio</groupId>
-    <artifactId>parent-help</artifactId>
+    <artifactId>parent-helps</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../help-pom.xml</relativePath>
   </parent>
 
   <artifactId>ldifeditor.help</artifactId>

Added: directory/studio/trunk/helps/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/helps/pom.xml?rev=985859&view=auto
==============================================================================
--- directory/studio/trunk/helps/pom.xml (added)
+++ directory/studio/trunk/helps/pom.xml Mon Aug 16 10:30:03 2010
@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--
+  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory.studio</groupId>
+    <artifactId>parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+  
+  <groupId>org.apache.directory.studio</groupId>
+  <artifactId>parent-helps</artifactId>
+  <name>Apache Directory Studio Help Plugins</name>
+  <packaging>pom</packaging>
+  
+  <modules>
+    <module>schemaeditor.help</module>
+    <module>ldifeditor.help</module>
+    <module>ldapbrowser.help</module>
+    <module>apacheds.configuration.help</module>
+    <module>rcp.help</module>
+    <module>apacheds.help</module>
+  </modules>
+  
+  <profiles>
+    <!-- UserGuides -->
+    <profile>
+      <id>userguides</id>
+      <build>
+        <resources>
+          <resource>
+            <directory>src/main/resources/html</directory>
+            <targetPath>../pdf</targetPath>
+          </resource>
+          <resource>
+            <directory>src/main/resources/html</directory>
+            <targetPath>../html</targetPath>
+          </resource>
+          <resource>
+            <directory>src/main/docbook</directory>
+            <targetPath>../docbook/documents</targetPath>
+            <filtering>true</filtering>
+          </resource>
+        </resources>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <dependencies>
+              <!-- 
+                Putting this dependency in the core pom produces following error (?):
+                Embedded error: java.lang.ClassCastException: org.apache.fop.render.pdf.PDFRendererMaker
cannot be cast to org.apache.fop.render.AbstractRendererMaker
+              -->
+              <dependency>
+                <groupId>org.apache.xmlgraphics</groupId>
+                <artifactId>xmlgraphics-commons</artifactId>
+                <version>1.1</version>
+                <scope>compile</scope>
+              </dependency>
+            </dependencies>
+            <executions>
+              <execution>
+                <id>build-pdf-html-help</id>
+                <phase>compile</phase>
+                <configuration>
+                  <tasks>
+                    <taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop">
+                      <classpath>
+                        <path refid="maven.compile.classpath" />
+                        <pathelement location="${project.build.outputDirectory}" />
+                      </classpath>
+                    </taskdef>
+
+                    <!-- Prepare docbook -->
+                    <property name="fromregexpxml" value="^(docbook-xml-[^/]+)/(.*)" />
+                    <property name="toregexpxml" value="docbook-xml/\2" />
+                    <move todir="target/docbook">
+                      <fileset dir="target/docbook">
+                        <include name="docbook-xml-*/**" />
+                      </fileset>
+                      <regexpmapper from="${fromregexpxml}" to="${toregexpxml}" handledirsep="true"
/>
+                    </move>
+
+                    <property name="fromregexpxsl" value="^(docbook-xsl-[^/]+)/(.*)" />
+                    <property name="toregexpxsl" value="docbook-xsl/\2" />
+                    <move todir="target/docbook">
+                      <fileset dir="target/docbook">
+                        <include name="docbook-xsl-*/**" />
+                      </fileset>
+                      <regexpmapper from="${fromregexpxsl}" to="${toregexpxsl}" handledirsep="true"
/>
+                    </move>
+
+                    <!-- Create PDF -->
+                    <xslt basedir="target/docbook" in="target/docbook/documents/0_index.xml"
out="target/pdf/${artifactId}.fo" style="target/docbook/docbook-xsl/fo/docbook.xsl">
+                      <param name="manifest.in.base.dir" expression="0" />
+                      <param name="generate.section.toc.level" expression="5" />
+                      <param name="toc.max.depth" expression="3" />
+                      <param name="ulink.target" expression="_self" />
+                      <param name="suppress.navigation" expression="0" />
+                      <param name="use.id.as.filename" expression="1" />
+                      <param name="chapter.autolabel" expression="I" />
+                      <param name="section.autolabel" expression="1" />
+                      <outputproperty name="method" value="xml" />
+                      <outputproperty name="standalone" value="yes" />
+                      <outputproperty name="encoding" value="iso8859_1" />
+                      <outputproperty name="indent" value="es" />
+                    </xslt>
+                    <fop format="application/pdf" basedir="target/pdf" fofile="target/pdf/${artifactId}.fo"
outfile="target/pdf/${name}.pdf" />
+
+                    <!-- Create HTML -->
+                    <xslt in="target/docbook/documents/0_index.xml" out="target/html/index.html"
style="target/docbook/docbook-xsl/html/chunk.xsl">
+                      <param name="ignore.image.scaling" expression="1" />
+                      <param name="manifest.in.base.dir" expression="0" />
+                      <!-- <param name="base.dir" expression="html/" /> -->
+                      <param name="html.stylesheet" expression="css/book.css" />
+                      <param name="table.cell.borders.thickness" expression="1" />
+                      <!-- <param name="table.borders.with.css" expression="1" />
-->
+                      <param name="generate.section.toc.level" expression="5" />
+                      <param name="toc.max.depth" expression="3" />
+                      <param name="chunk.first.sections" expression="1" />
+                      <param name="chunk.section.depth" expression="5" />
+                      <param name="chunk.fast" expression="1" />
+                      <param name="chunk.separate.lots" expression="1" />
+                      <!--<param name="chunk.tocs.and.lots" expression="1" />-->
+                      <param name="ulink.target" expression="_self" />
+                      <param name="suppress.navigation" expression="0" />
+                      <param name="html.cleanup" expression="1" />
+                      <param name="html.cellpadding" expression="3" />
+                      <param name="use.id.as.filename" expression="1" />
+                      <param name="chapter.autolabel" expression="0" />
+                      <param name="section.autolabel" expression="0" />
+                      <outputproperty name="method" value="xml" />
+                      <outputproperty name="standalone" value="yes" />
+                      <outputproperty name="encoding" value="iso8859_1" />
+                      <outputproperty name="indent" value="es" />
+                    </xslt>
+
+                    <!-- Copy PDF/HTML to ../target -->
+                    <mkdir dir="../target/userguides" />
+                    <copy todir="../target/userguides">
+                      <fileset dir="target/pdf" />
+                    </copy>
+                    <mkdir dir="../target/userguides/${name}" />
+                    <copy todir="../target/userguides/${name}">
+                      <fileset dir="target/html" />
+                    </copy>
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>plugin.xml</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>src/main/docbook</directory>
+        <targetPath>../docbook/documents</targetPath>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <configuration>
+          <buildcommands>
+            <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
+            <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
+          </buildcommands>
+          <projectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+          </projectnatures>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>studio-maven-plugin</artifactId>
+        <configuration>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+      </plugin>
+      
+      <!-- MANIFEST.MF Generation -->
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <manifestLocation>META-INF</manifestLocation>
+          <instructions>            
+            <Bundle-SymbolicName>${groupId}.${artifactId};singleton:=true</Bundle-SymbolicName>
+            <Bundle-Localization>plugin</Bundle-Localization>
+            <Eclipse-LazyStart>true</Eclipse-LazyStart>
+            <Export-Package>!</Export-Package>
+          </instructions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>generate-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack-docbook-dependencies</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <overWrite>true</overWrite>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>docbook</groupId>
+                  <artifactId>docbook-xml</artifactId>
+                  <type>zip</type>
+                  <outputDirectory>target/docbook/docbook-xml</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>docbook</groupId>
+                  <artifactId>docbook-xsl</artifactId>
+                  <type>zip</type>
+                  <outputDirectory>target/docbook</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>build-eclipse-help</id>
+            <phase>process-classes</phase>
+            <configuration>
+              <tasks>
+                <!-- Prepare docbook -->
+                <property name="fromregexpxml" value="^(docbook-xml-[^/]+)/(.*)" />
+                <property name="toregexpxml" value="docbook-xml/\2" />
+                <move todir="target/docbook">
+                  <fileset dir="target/docbook">
+                    <include name="docbook-xml-*/**" />
+                  </fileset>
+                  <regexpmapper from="${fromregexpxml}" to="${toregexpxml}" handledirsep="true"
/>
+                </move>
+
+                <property name="fromregexpxsl" value="^(docbook-xsl-[^/]+)/(.*)" />
+                <property name="toregexpxsl" value="docbook-xsl/\2" />
+                <move todir="target/docbook">
+                  <fileset dir="target/docbook">
+                    <include name="docbook-xsl-*/**" />
+                  </fileset>
+                  <regexpmapper from="${fromregexpxsl}" to="${toregexpxsl}" handledirsep="true"
/>
+                </move>
+
+                <!-- Create HTML -->
+                <xslt basedir="target/docbook/" in="target/docbook/documents/0_index.xml"
out="target/classes/index.html" style="target/docbook/docbook-xsl/eclipse/eclipse.xsl">
+                  <param name="ignore.image.scaling" expression="1" />
+                  <param name="manifest.in.base.dir" expression="0" />
+                  <param name="base.dir" expression="html/" />
+                  <param name="html.stylesheet" expression="css/book.css" />
+                  <param name="table.cell.borders.thickness" expression="1" />
+                  <!-- <param name="table.borders.with.css" expression="1" /> -->
+                  <param name="generate.section.toc.level" expression="5" />
+                  <param name="toc.max.depth" expression="1" />
+                  <param name="chunk.first.sections" expression="1" />
+                  <param name="chunk.section.depth" expression="5" />
+                  <param name="chunk.fast" expression="1" />
+                  <param name="chunk.separate.lots" expression="1" />
+                  <!--<param name="chunk.tocs.and.lots" expression="1" />-->
+                  <param name="ulink.target" expression="_self" />
+                  <param name="suppress.navigation" expression="1" />
+                  <param name="html.cleanup" expression="1" />
+                  <param name="html.cellpadding" expression="3" />
+                  <param name="use.id.as.filename" expression="1" />
+                  <param name="chapter.autolabel" expression="0" />
+                  <param name="section.autolabel" expression="0" />
+                  <outputproperty name="method" value="xml" />
+                  <outputproperty name="standalone" value="yes" />
+                  <outputproperty name="encoding" value="iso8859_1" />
+                  <outputproperty name="indent" value="es" />
+                </xslt>
+                
+                <!-- Copy the good plugin.xml. 
+                     The eclipse.xsl creates its own plugin.xml but we want 
+                     to use our own.
+                -->
+                <copy todir="target/classes" file="plugin.xml" overwrite="true" />
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- No tests to run -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Modified: directory/studio/trunk/helps/rcp.help/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/helps/rcp.help/pom.xml?rev=985859&r1=984798&r2=985859&view=diff
==============================================================================
--- directory/studio/trunk/helps/rcp.help/pom.xml (original)
+++ directory/studio/trunk/helps/rcp.help/pom.xml Mon Aug 16 10:30:03 2010
@@ -22,9 +22,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.studio</groupId>
-    <artifactId>parent-help</artifactId>
+    <artifactId>parent-helps</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../help-pom.xml</relativePath>
   </parent>
 
   <artifactId>rcp.help</artifactId>

Modified: directory/studio/trunk/helps/schemaeditor.help/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/helps/schemaeditor.help/pom.xml?rev=985859&r1=984798&r2=985859&view=diff
==============================================================================
--- directory/studio/trunk/helps/schemaeditor.help/pom.xml (original)
+++ directory/studio/trunk/helps/schemaeditor.help/pom.xml Mon Aug 16 10:30:03 2010
@@ -22,9 +22,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.studio</groupId>
-    <artifactId>parent-help</artifactId>
+    <artifactId>parent-helps</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <relativePath>../help-pom.xml</relativePath>
   </parent>
 
   <artifactId>schemaeditor.help</artifactId>

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=985859&r1=985858&r2=985859&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Mon Aug 16 10:30:03 2010
@@ -177,18 +177,8 @@
     <profile>
       <id>studio-full</id>
       <modules>
-        <module>schemaeditor.help</module>
-        <module>ldifeditor.help</module>
-        <module>ldapbrowser.help</module>
-        <module>apacheds.configuration.help</module>
-        <module>rcp.help</module>
-        <module>apacheds.help</module>
-        <module>apacheds.configuration.feature</module>
-        <module>apacheds.feature</module>
-        <module>ldapbrowser.feature</module>
-        <module>ldifeditor.feature</module>
-        <module>rcp.feature</module>
-        <module>schemaeditor.feature</module>
+        <module>helps</module>
+        <module>features</module>
       </modules>
     </profile>
     <!-- 
@@ -199,8 +189,7 @@
     <profile>
       <id>integration-tests</id>
       <modules>
-        <module>test.integration.core</module>
-        <module>test.integration.ui</module>
+        <module>tests</module>
       </modules>
     </profile>
     <!--

Added: directory/studio/trunk/tests/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/pom.xml?rev=985859&view=auto
==============================================================================
--- directory/studio/trunk/tests/pom.xml (added)
+++ directory/studio/trunk/tests/pom.xml Mon Aug 16 10:30:03 2010
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--
+  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory.studio</groupId>
+    <artifactId>parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>parent-tests</artifactId>
+  <name>Apache Directory Studio Test Plugins</name>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>test.integration.core</module>
+    <module>test.integration.ui</module>
+  </modules>
+  
+</project>

Modified: directory/studio/trunk/tests/test.integration.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.core/pom.xml?rev=985859&r1=984798&r2=985859&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.core/pom.xml (original)
+++ directory/studio/trunk/tests/test.integration.core/pom.xml Mon Aug 16 10:30:03 2010
@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.studio</groupId>
-    <artifactId>parent</artifactId>
+    <artifactId>parent-tests</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   

Copied: directory/studio/trunk/tests/test.integration.ui/pom.xml (from r985168, directory/studio/trunk/test.integration.ui/pom.xml)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/pom.xml?p2=directory/studio/trunk/tests/test.integration.ui/pom.xml&p1=directory/studio/trunk/test.integration.ui/pom.xml&r1=985168&r2=985859&rev=985859&view=diff
==============================================================================
--- directory/studio/trunk/test.integration.ui/pom.xml (original)
+++ directory/studio/trunk/tests/test.integration.ui/pom.xml Mon Aug 16 10:30:03 2010
@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.studio</groupId>
-    <artifactId>parent</artifactId>
+    <artifactId>parent-tests</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   



Mime
View raw message