directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r952747 [2/2] - in /directory/studio/branches/studio-improved-build: ./ application/ application/application-eclipse-plugins/ application/application-eclipse-plugins/src/ application/application-eclipse-plugins/src/main/ application/applica...
Date Tue, 08 Jun 2010 17:39:17 GMT
Added: directory/studio/branches/studio-improved-build/application/application-macosx/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-macosx/pom.xml?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-macosx/pom.xml (added)
+++ directory/studio/branches/studio-improved-build/application/application-macosx/pom.xml Tue Jun  8 17:39:15 2010
@@ -0,0 +1,213 @@
+<?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>application</artifactId>
+    <version>1.5.4-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>ApacheDirectoryStudio-macosx</artifactId>
+  <name>Apache Directory Studio Application Mac OS X</name>
+  <packaging>pom</packaging>
+  
+  <properties>
+    <app-dir>${studio-dir}-macosx</app-dir>
+    <plugins-dir>${app-dir}/Apache Directory Studio.app/Contents/Resources/Java/plugins</plugins-dir>
+    <features-dir>${app-dir}/Apache Directory Studio.app/Contents/Resources/Java/features</features-dir>
+  </properties>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-studio-launcher-macosx</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>launcher-macosx</artifactId>
+                  <type>tar.gz</type>
+                  <outputDirectory>${project.build.directory}</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>unpack-plugins-features-archives</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>application-plugins</artifactId>
+                  <type>zip</type>
+                  <version>${project.version}</version> <!-- TODO -->
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>application-eclipse-plugins</artifactId>
+                  <type>zip</type>
+                  <version>${project.version}</version> <!-- TODO -->
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>application-features</artifactId>
+                  <classifier>unpacked</classifier>
+                  <type>zip</type>
+                  <version>${project.version}</version> <!-- TODO -->
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <!-- Unpack the Studio launcher for Mac OS X -->
+          <execution>
+            <id>unpack-studio-launcher-macosx</id>
+            <phase>generate-resources</phase>
+            <configuration>
+              <tasks>
+                <untar dest="${app-dir}" compression="gzip">
+                    <fileset dir="${project.build.directory}" includes="launcher-macosx*.tar.gz"/>
+                </untar>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <!-- Copy plugins and features -->
+          <execution>
+            <id>copy-plugins-features</id>
+            <phase>process-resources</phase>
+            <configuration>
+              <tasks>
+                <copy todir="${plugins-dir}">
+                  <fileset dir="${project.build.directory}/application-plugins-${project.version}" />
+                  <fileset dir="${project.build.directory}/application-eclipse-plugins-${project.version}" />
+                </copy>
+                <copy todir="${features-dir}">
+                  <fileset dir="${project.build.directory}/application-features-${project.version}" />
+                </copy>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>studio-maven-plugin</artifactId>
+        <executions>
+          <!-- Copy specific plugins for Mac OS X -->
+          <execution>
+            <id>copy-plugins-macosx</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-eclipse-artifact</goal>
+            </goals>
+            <configuration>
+              <destinationDirectory>${plugins-dir}</destinationDirectory>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.eclipse.core.filesystem</groupId>
+                  <artifactId>macosx</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.eclipse.jdt.launching</groupId>
+                  <artifactId>macosx</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.eclipse.ui</groupId>
+                  <artifactId>carbon</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.eclipse.swt.carbon</groupId>
+                  <artifactId>macosx</artifactId>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <!-- Unpack specific plugins for Mac OS X -->
+          <execution>
+          <id>unpack-plugins-macosx</id>
+          <phase>generate-resources</phase>
+          <goals>
+            <goal>unpack-with-artifactid-prefix</goal>
+          </goals>
+          <configuration>
+            <outputDirectory>${plugins-dir}</outputDirectory>
+            <artifactItems>
+              <artifactItem>
+                  <groupId>org.eclipse.equinox.launcher.carbon</groupId>
+                  <artifactId>macosx</artifactId>
+  				  <type>zip</type>
+              </artifactItem>
+            </artifactItems>
+          </configuration>
+        </execution>
+        </executions>
+      </plugin>
+  
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <!-- Create the distribution file -->
+          <execution>
+            <id>assembly-distribution-macosx</id>
+            <phase>package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assembly/application.xml</descriptor>
+              </descriptors>
+            </configuration>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  
+</project>

Added: directory/studio/branches/studio-improved-build/application/application-macosx/src/main/assembly/application.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-macosx/src/main/assembly/application.xml?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-macosx/src/main/assembly/application.xml (added)
+++ directory/studio/branches/studio-improved-build/application/application-macosx/src/main/assembly/application.xml Tue Jun  8 17:39:15 2010
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+<!-- $Rev:  $ $Date:  $ -->
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+    <id></id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <!-- Application files except the main executable -->
+        <fileSet>
+            <directory>${app-dir}</directory>
+            <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio</exclude>
+            </excludes>
+            <fileMode>644</fileMode>
+        </fileSet>
+        
+        <!-- Application executable -->
+        <fileSet>
+            <directory>${app-dir}</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio</include>
+            </includes>
+            <fileMode>755</fileMode>
+        </fileSet>
+        
+        <!-- Configuration file -->
+        <fileSet>
+            <directory>src/main/configuration</directory>
+            <outputDirectory>/Apache Directory Studio.app/Contents/Resources/Java/configuration</outputDirectory>
+            <includes>
+                <include>config.ini</include>
+            </includes>
+            <fileMode>644</fileMode>
+        </fileSet>
+        
+        <!-- Legal files & release notes -->
+        <fileSet>
+            <directory>../../docs</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+                <include>Release Notes.txt</include>
+            </includes>
+            <fileMode>644</fileMode>
+        </fileSet>
+    </fileSets>
+</assembly>

Added: directory/studio/branches/studio-improved-build/application/application-macosx/src/main/configuration/config.ini
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-macosx/src/main/configuration/config.ini?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-macosx/src/main/configuration/config.ini (added)
+++ directory/studio/branches/studio-improved-build/application/application-macosx/src/main/configuration/config.ini Tue Jun  8 17:39:15 2010
@@ -0,0 +1,12 @@
+#Product Runtime Configuration File
+
+osgi.splashPath=platform:/base/plugins/org.apache.directory.studio.rcp
+eclipse.product=org.apache.directory.studio.rcp.product
+osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.core.runtime@start
+osgi.bundles.defaultStartLevel=4
+
+# Use system small fonts (Mac OS X only)
+org.eclipse.swt.internal.carbon.smallFonts=true
+
+# The workspace location
+osgi.instance.area.default=@user.home/.ApacheDirectoryStudio

Added: directory/studio/branches/studio-improved-build/application/application-macosx/src/main/site/site.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-macosx/src/main/site/site.xml?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-macosx/src/main/site/site.xml (added)
+++ directory/studio/branches/studio-improved-build/application/application-macosx/src/main/site/site.xml Tue Jun  8 17:39:15 2010
@@ -0,0 +1,26 @@
+<?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 name="${project.name}">
+  <body>
+    <menu ref="parent" />
+    <menu ref="reports" />
+  </body>
+</project>

Added: directory/studio/branches/studio-improved-build/application/application-plugins/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-plugins/pom.xml?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-plugins/pom.xml (added)
+++ directory/studio/branches/studio-improved-build/application/application-plugins/pom.xml Tue Jun  8 17:39:15 2010
@@ -0,0 +1,159 @@
+<?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>application</artifactId>
+    <version>1.5.4-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>application-plugins</artifactId>
+  <name>Apache Directory Studio Application Plugins</name>
+  <packaging>pom</packaging>
+  
+  <properties>
+    <plugins-dir>target/plugins</plugins-dir>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>studio-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-plugins</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>copy-eclipse-artifact</goal>
+            </goals>
+            <configuration>
+              <destinationDirectory>${plugins-dir}</destinationDirectory>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>aciitemeditor</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>apacheds</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>apacheds.configuration</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>apacheds.configuration.help</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>apacheds.help</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>common.ui</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>connection.core</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>connection.ui</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>jars</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>ldapbrowser.core</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>ldapbrowser.common</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>ldapbrowser.help</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>ldapbrowser.ui</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>ldifeditor</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>ldifeditor.help</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>ldifparser</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>rcp</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>rcp.help</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>schemaeditor</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>schemaeditor.help</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>valueeditors</artifactId>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+        <plugin>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <executions>
+            <execution>
+              <phase>package</phase>
+              <configuration>
+                <descriptors>
+                  <descriptor>src/main/assembly/plugins.xml</descriptor>
+                </descriptors>
+              </configuration>
+              <goals>
+                <goal>single</goal>
+              </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: directory/studio/branches/studio-improved-build/application/application-plugins/src/main/assembly/plugins.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-plugins/src/main/assembly/plugins.xml?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-plugins/src/main/assembly/plugins.xml (added)
+++ directory/studio/branches/studio-improved-build/application/application-plugins/src/main/assembly/plugins.xml Tue Jun  8 17:39:15 2010
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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>
+-->
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+    <id></id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <!-- Platform specific -->
+        <fileSet>
+            <directory>${plugins-dir}</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>*</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
+

Added: directory/studio/branches/studio-improved-build/application/application-plugins/src/main/site/site.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-plugins/src/main/site/site.xml?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-plugins/src/main/site/site.xml (added)
+++ directory/studio/branches/studio-improved-build/application/application-plugins/src/main/site/site.xml Tue Jun  8 17:39:15 2010
@@ -0,0 +1,26 @@
+<?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 name="${project.name}">
+  <body>
+    <menu ref="parent" />
+    <menu ref="reports" />
+  </body>
+</project>

Added: directory/studio/branches/studio-improved-build/application/application-unpack/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-unpack/pom.xml?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-unpack/pom.xml (added)
+++ directory/studio/branches/studio-improved-build/application/application-unpack/pom.xml Tue Jun  8 17:39:15 2010
@@ -0,0 +1,194 @@
+<?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>application</artifactId>
+    <version>1.5.4-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>application-unpack</artifactId>
+  <name>Apache Directory Studio Application Unpack</name>
+  <packaging>pom</packaging>
+  
+  <properties>
+    <distributions-dir>../../target/distributions/</distributions-dir>
+  </properties>
+  
+  <profiles>
+    <profile>
+      <id>linux-x86</id>
+      <activation>
+        <os>
+          <arch>i386</arch>
+          <family>unix</family>
+          <name>linux</name>
+        </os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>unpack-dist-linux-x86 (for immediate use)</id>
+                <phase>install</phase>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <outputDirectory>${distributions-dir}</outputDirectory>
+                  <overWrite>true</overWrite>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.apache.directory.studio</groupId>
+                      <artifactId>ApacheDirectoryStudio-linux-x86</artifactId>
+                      <version>${project.version}</version> <!-- TODO -->
+                      <type>tar.gz</type>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>linux-x86_64</id>
+      <activation>
+        <os>
+          <arch>amd64</arch>
+          <family>unix</family>
+          <name>linux</name>
+        </os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>unpack-dist-linux-x86_64 (for immediate use)</id>
+                <phase>install</phase>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <outputDirectory>${distributions-dir}</outputDirectory>
+                  <overWrite>true</overWrite>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.apache.directory.studio</groupId>
+                      <artifactId>ApacheDirectoryStudio-linux-x86_64</artifactId>
+                      <version>${project.version}</version> <!-- TODO -->
+                      <type>tar.gz</type>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>win32</id>
+      <activation>
+        <os>
+          <arch>x86</arch>
+          <family>windows</family>
+        </os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>unpack-dist-win32 (for immediate use)</id>
+                <phase>install</phase>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <outputDirectory>${distributions-dir}</outputDirectory>
+                  <overWrite>true</overWrite>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.apache.directory.studio</groupId>
+                      <artifactId>ApacheDirectoryStudio-win32</artifactId>
+                      <version>${project.version}</version> <!-- TODO -->
+                      <type>zip</type>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>macosx</id>
+      <activation>
+        <os>
+          <family>unix</family>
+          <name>mac os x</name>
+        </os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>unpack-dist-macosx (for immediate use)</id>
+                <phase>install</phase>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <outputDirectory>${distributions-dir}</outputDirectory>
+                  <overWrite>true</overWrite>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.apache.directory.studio</groupId>
+                      <artifactId>ApacheDirectoryStudio-macosx</artifactId>
+                      <version>${project.version}</version> <!-- TODO -->
+                      <type>zip</type>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
+</project>

Added: directory/studio/branches/studio-improved-build/application/application-updatesite/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-updatesite/pom.xml?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-updatesite/pom.xml (added)
+++ directory/studio/branches/studio-improved-build/application/application-updatesite/pom.xml Tue Jun  8 17:39:15 2010
@@ -0,0 +1,116 @@
+<?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>application</artifactId>
+    <version>1.5.4-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>ApacheDirectoryStudio-updatesite</artifactId>
+  <name>Apache Directory Studio Application Update Site</name>
+  <packaging>pom</packaging>
+  
+  <properties>
+    <updatesite-dir>${studio-dir}-updatesite</updatesite-dir>
+    <plugins-dir>${updatesite-dir}/plugins</plugins-dir>
+    <features-dir>${updatesite-dir}/features</features-dir>
+  </properties>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>application-plugins</artifactId>
+                  <type>zip</type>
+                  <version>${project.version}</version> <!-- TODO -->
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>application-features</artifactId>
+                  <classifier>packed</classifier>
+                  <type>zip</type>
+                  <version>${project.version}</version> <!-- TODO -->
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>process-resources</phase>
+            <configuration>
+              <tasks>
+                <copy todir="${plugins-dir}">
+                  <fileset dir="${project.build.directory}/application-plugins-${project.version}" />
+                </copy>
+                <copy todir="${features-dir}">
+                  <fileset dir="${project.build.directory}/application-features-${project.version}" />
+                </copy>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+  
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assembly/updatesite.xml</descriptor>
+                <descriptor>src/main/assembly/updatesite-pao.xml</descriptor>
+              </descriptors>
+            </configuration>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  
+</project>

Added: directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/assembly/updatesite-pao.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/assembly/updatesite-pao.xml?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/assembly/updatesite-pao.xml (added)
+++ directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/assembly/updatesite-pao.xml Tue Jun  8 17:39:15 2010
@@ -0,0 +1,57 @@
+<?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>
+-->
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+    <id>poa</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <!-- Plugins and Features jars -->
+        <fileSet>
+            <directory>${updatesite-dir}</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+        
+        <!-- Update site files-->
+        <fileSet>
+            <directory>src/main/resources</directory>
+            <includes>
+                <include>index.html</include>
+                <include>htaccess</include>
+                <include>site--xml.cgi</include>
+                <include>site--xml.html</include>
+            </includes>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+        
+        <!-- Legal files & release notes -->
+        <fileSet>
+            <directory>../../docs</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+                <include>Release Notes.txt</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
+

Added: directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/assembly/updatesite.xml?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/assembly/updatesite.xml (added)
+++ directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/assembly/updatesite.xml Tue Jun  8 17:39:15 2010
@@ -0,0 +1,55 @@
+<?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>
+-->
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+    <id></id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <!-- Plugins and Features jars -->
+        <fileSet>
+            <directory>${updatesite-dir}</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+        
+        <!-- Update site files-->
+        <fileSet>
+            <directory>src/main/resources</directory>
+            <includes>
+                <include>index.html</include>
+                <include>site.xml</include>
+            </includes>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+        
+        <!-- Legal files & release notes -->
+        <fileSet>
+            <directory>../../docs</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+                <include>Release Notes.txt</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
+

Added: directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/htaccess
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/htaccess?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/htaccess (added)
+++ directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/htaccess Tue Jun  8 17:39:15 2010
@@ -0,0 +1,6 @@
+RewriteEngine on
+
+RewriteBase /studio/update
+
+RewriteRule ^site.xml$ site--xml.cgi [L]
+

Added: directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/index.html
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/index.html?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/index.html (added)
+++ directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/index.html Tue Jun  8 17:39:15 2010
@@ -0,0 +1,60 @@
+<html>
+<head>
+<title>studio-updatesite</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<style>@import url("web/site.css");</style>
+<script type="text/javascript">
+	var returnval = 0;
+	var stylesheet, xmlFile, cache, doc;
+	function init(){
+		// NSCP 7.1+ / Mozilla 1.4.1+ / Safari
+		// Use the standard DOM Level 2 technique, if it is supported
+		if (document.implementation && document.implementation.createDocument) {
+			xmlFile = document.implementation.createDocument("", "", null);
+			stylesheet = document.implementation.createDocument("", "", null);
+			if (xmlFile.load){
+				xmlFile.load("site.xml");
+				stylesheet.load("web/site.xsl");
+			} else {
+				alert("Document could not be loaded by browser.");
+			}
+			xmlFile.addEventListener("load", transform, false);
+			stylesheet.addEventListener("load", transform, false);
+		}
+		//IE 6.0+ solution
+		else if (window.ActiveXObject) {
+			xmlFile = new ActiveXObject("msxml2.DOMDocument.3.0");
+			xmlFile.async = false;
+			xmlFile.load("site.xml");
+			stylesheet = new ActiveXObject("msxml2.FreeThreadedDOMDocument.3.0");
+			stylesheet.async = false;
+			stylesheet.load("web/site.xsl");
+			cache = new ActiveXObject("msxml2.XSLTemplate.3.0");
+			cache.stylesheet = stylesheet;
+			transformData();
+		}
+	}
+	// separate transformation function for IE 6.0+
+	function transformData(){
+		var processor = cache.createProcessor();
+		processor.input = xmlFile;
+		processor.transform();
+		data.innerHTML = processor.output;
+	}
+	// separate transformation function for NSCP 7.1+ and Mozilla 1.4.1+ 
+	function transform(){
+		returnval+=1;
+		if (returnval==2){
+			var processor = new XSLTProcessor();
+			processor.importStylesheet(stylesheet); 
+			doc = processor.transformToDocument(xmlFile);
+			document.getElementById("data").innerHTML = doc.documentElement.innerHTML;
+		}
+	}
+</script>
+</head>
+<body onload="init();">
+<!--[insert static HTML here]-->
+<div id="data"><!-- this is where the transformed data goes --></div>
+</body>
+</html>

Added: directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/site--xml.cgi
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/site--xml.cgi?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/site--xml.cgi (added)
+++ directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/site--xml.cgi Tue Jun  8 17:39:15 2010
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Wrapper script around mirrors.cgi script
+# (we must change to that directory in order for python to pick up the
+#  python includes correctly)
+cd /www/www.apache.org/dyn/mirrors
+/www/www.apache.org/dyn/mirrors/mirrors.cgi $* 

Propchange: directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/site--xml.cgi
------------------------------------------------------------------------------
    svn:executable = *

Added: directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/site--xml.html
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/site--xml.html?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/site--xml.html (added)
+++ directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/site--xml.html Tue Jun  8 17:39:15 2010
@@ -0,0 +1,142 @@
+<?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.
+-->
+<site>
+	<description url="http://directory.apache.org/studio/update/1.x">
+      The Apache Directory Studio update site.
+   </description>
+   <feature 
+   		url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.rcp.feature_${pom.version}.jar" 
+   		id="org.apache.directory.studio.rcp.feature" version="${pom.version}"
+   		os="linux,macosx,win32" ws="carbon,gtk,win32" arch="ppc,x86,x86_64">
+      <category name="Apache Directory Studio RCP"/>
+   </feature>
+   <feature 
+   		url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.ldapbrowser.feature_${pom.version}.jar" 
+   		id="org.apache.directory.studio.ldapbrowser.feature" version="${pom.version}">
+      <category name="Apache Directory Studio LDAP Browser"/>
+   </feature>
+   <feature 
+   		url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.schemaeditor.feature_${pom.version}.jar" 
+   		id="org.apache.directory.studio.schemaeditor.feature" version="${pom.version}">
+      <category name="Apache Directory Studio Schema Editor"/>
+   </feature>
+   <feature 
+   		url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.apacheds.configuration.feature_${pom.version}.jar" 
+   		id="org.apache.directory.studio.apacheds.configuration.feature" version="${pom.version}">
+      <category name="Apache Directory Studio Apache DS"/>
+   </feature>
+   <feature 
+   		url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.apacheds.feature_${pom.version}.jar" 
+   		id="org.apache.directory.studio.apacheds.feature" version="${pom.version}">
+      <category name="Apache Directory Studio Apache DS"/>
+   </feature>
+   <feature url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.ldifeditor.feature_${pom.version}.jar"
+       id="org.apache.directory.studio.ldifeditor.feature" version="${pom.version}">
+      <category name="Apache Directory Studio LDIF Editor"/>
+   </feature>
+   <archive 
+   		path="plugins/org.apache.directory.studio.aciitemeditor_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.aciitemeditor_${pom.version}.jar"/>
+   <archive 
+   		path="plugins/org.apache.directory.studio.apacheds.configuration.help_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.apacheds.configuration.help_${pom.version}.jar"/>
+   <archive 
+   		path="plugins/org.apache.directory.studio.apacheds.configuration_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.apacheds.configuration_${pom.version}.jar"/>
+   <archive 
+   		path="plugins/org.apache.directory.studio.apacheds_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.apacheds_${pom.version}.jar"/>
+   <archive 
+   		path="plugins/org.apache.directory.studio.apacheds.help_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.apacheds.help_${pom.version}.jar"/>
+   <archive
+   		path="plugins/org.apache.directory.studio.common.ui_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.common.ui_${pom.version}.jar"/>
+   <archive
+   		path="plugins/org.apache.directory.studio.connection.core_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.connection.core_${pom.version}.jar"/>
+   <archive
+   		path="plugins/org.apache.directory.studio.connection.ui_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.connection.ui_${pom.version}.jar"/>
+   <archive
+   		path="plugins/org.apache.directory.studio.ldapbrowser.common_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldapbrowser.common_${pom.version}.jar"/>
+   <archive 
+   		path="plugins/org.apache.directory.studio.ldapbrowser.core_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldapbrowser.core_${pom.version}.jar"/>
+   <archive 
+   		path="plugins/org.apache.directory.studio.ldapbrowser.help_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldapbrowser.help_${pom.version}.jar"/>
+   <archive 
+   		path="plugins/org.apache.directory.studio.ldapbrowser.ui_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldapbrowser.ui_${pom.version}.jar"/>
+   <archive 
+   		path="plugins/org.apache.directory.studio.rcp.help_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.rcp.help_${pom.version}.jar"/>
+   <archive 
+   		path="plugins/org.apache.directory.studio.jars_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.jars_${pom.version}.jar"/>
+   <archive 
+   		path="plugins/org.apache.directory.studio.ldifeditor_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldifeditor_${pom.version}.jar"/>
+   <archive 
+   		path="plugins/org.apache.directory.studio.ldifeditor.help_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldifeditor.help_${pom.version}.jar"/>
+   <archive 
+   		path="plugins/org.apache.directory.studio.ldifparser_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldifparser_${pom.version}.jar"/>
+   <archive 
+   		path="plugins/org.apache.directory.studio.schemaeditor.help_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.schemaeditor.help_${pom.version}.jar"/>
+   <archive 
+   		path="plugins/org.apache.directory.studio.schemaeditor_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.schemaeditor_${pom.version}.jar"/>
+   <archive 
+   		path="plugins/org.apache.directory.studio.valueeditors_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.valueeditors_${pom.version}.jar"/>
+   <archive 
+   		path="plugins/org.apache.directory.studio.rcp_${pom.version}.jar" 
+   		url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.rcp_${pom.version}.jar"/>
+   <category-def name="Apache Directory Studio RCP" label="Apache Directory Studio RCP">
+      <description>
+         The Apache Directory Studio RCP category contains all features related to the RCP Application.
+      </description>
+   </category-def>
+   <category-def name="Apache Directory Studio LDAP Browser" label="Apache Directory Studio LDAP Browser">
+      <description>
+         The Apache Directory Studio Browser category contains all features related to the LDAP Browser.
+      </description>
+   </category-def>
+   <category-def name="Apache Directory Studio Schema Editor" label="Apache Directory Studio Schema Editor">
+      <description>
+         The Apache Directory Studio Schema category contains all features related to the Schema Editor.
+      </description>
+   </category-def>
+   <category-def name="Apache Directory Studio Apache DS" label="Apache Directory Studio Apache DS">
+      <description>
+         The Apache Directory Studio Apache DS category contains all features related to Apache DS.
+      </description>
+   </category-def>
+   <category-def name="Apache Directory Studio LDIF Editor" label="Apache Directory Studio LDIF Editor">
+      <description>
+         The Apache Directory Studio LDIF Editor category contains all features related to the LDIF Editor.
+      </description>
+   </category-def>
+</site>

Propchange: directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/site--xml.html
------------------------------------------------------------------------------
    svn:executable = *

Added: directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/site.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/site.xml?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/site.xml (added)
+++ directory/studio/branches/studio-improved-build/application/application-updatesite/src/main/resources/site.xml Tue Jun  8 17:39:15 2010
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <description url="http://directory.apache.org/studio/update/1.x">
+      The Apache Directory Studio update site.
+   </description>
+   <feature
+       url="features/org.apache.directory.studio.rcp.feature_${pom.version}.jar"
+       id="org.apache.directory.studio.rcp.feature" version="${pom.version}"
+       os="linux,macosx,win32" ws="carbon,gtk,win32" arch="ppc,x86,x86_64">
+      <category name="Apache Directory Studio RCP"/>
+   </feature>
+   <feature
+       url="features/org.apache.directory.studio.ldapbrowser.feature_${pom.version}.jar"
+       id="org.apache.directory.studio.ldapbrowser.feature" version="${pom.version}">
+      <category name="Apache Directory Studio LDAP Browser"/>
+   </feature>
+   <feature url="features/org.apache.directory.studio.schemaeditor.feature_${pom.version}.jar"
+       id="org.apache.directory.studio.schemaeditor.feature" version="${pom.version}">
+      <category name="Apache Directory Studio Schema Editor"/>
+   </feature>
+   <feature url="features/org.apache.directory.studio.apacheds.configuration.feature_${pom.version}.jar"
+       id="org.apache.directory.studio.apacheds.configuration.feature" version="${pom.version}">
+      <category name="Apache Directory Studio Apache DS"/>
+   </feature>
+   <feature url="features/org.apache.directory.studio.apacheds.feature_${pom.version}.jar"
+       id="org.apache.directory.studio.apacheds.feature" version="${pom.version}">
+      <category name="Apache Directory Studio Apache DS"/>
+   </feature>
+   <feature url="features/org.apache.directory.studio.ldifeditor.feature_${pom.version}.jar"
+       id="org.apache.directory.studio.ldifeditor.feature" version="${pom.version}">
+      <category name="Apache Directory Studio LDIF Editor"/>
+   </feature>
+   <category-def name="Apache Directory Studio RCP" label="Apache Directory Studio RCP">
+      <description>
+         The Apache Directory Studio RCP category contains all features related to the RCP Application.
+      </description>
+   </category-def>
+   <category-def name="Apache Directory Studio LDAP Browser" label="Apache Directory Studio LDAP Browser">
+      <description>
+         The Apache Directory Studio Browser category contains all features related to the LDAP Browser.
+      </description>
+   </category-def>
+   <category-def name="Apache Directory Studio Schema Editor" label="Apache Directory Studio Schema Editor">
+      <description>
+         The Apache Directory Studio Schema category contains all features related to the Schema Editor.
+      </description>
+   </category-def>
+   <category-def name="Apache Directory Studio Apache DS" label="Apache Directory Studio Apache DS">
+      <description>
+         The Apache Directory Studio Apache DS category contains all features related to Apache DS.
+      </description>
+   </category-def>
+   <category-def name="Apache Directory Studio LDIF Editor" label="Apache Directory Studio LDIF Editor">
+      <description>
+         The Apache Directory Studio LDIF Editor category contains all features related to the LDIF Editor.
+      </description>
+   </category-def>
+</site>

Added: directory/studio/branches/studio-improved-build/application/application-win32/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-win32/pom.xml?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-win32/pom.xml (added)
+++ directory/studio/branches/studio-improved-build/application/application-win32/pom.xml Tue Jun  8 17:39:15 2010
@@ -0,0 +1,205 @@
+<?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>application</artifactId>
+    <version>1.5.4-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>ApacheDirectoryStudio-win32</artifactId>
+  <name>Apache Directory Studio Application Win32</name>
+  <packaging>pom</packaging>
+  
+  <properties>
+    <app-dir>${studio-dir}-win32</app-dir>
+    <plugins-dir>${app-dir}/plugins</plugins-dir>
+    <features-dir>${app-dir}/features</features-dir>
+  </properties>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-studio-launcher-win32</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>launcher-win32</artifactId>
+                  <type>tar.gz</type>
+                  <outputDirectory>${project.build.directory}</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>unpack-plugins-features-archives</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>application-plugins</artifactId>
+                  <type>zip</type>
+                  <version>${project.version}</version> <!-- TODO -->
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>application-eclipse-plugins</artifactId>
+                  <type>zip</type>
+                  <version>${project.version}</version> <!-- TODO -->
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>application-features</artifactId>
+                  <classifier>unpacked</classifier>
+                  <type>zip</type>
+                  <version>${project.version}</version> <!-- TODO -->
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <!-- Unpack the Studio launcher for Win32 -->
+          <execution>
+            <id>unpack-studio-launcher-win32</id>
+            <phase>generate-resources</phase>
+            <configuration>
+              <tasks>
+                <untar dest="${app-dir}" compression="gzip">
+                    <fileset dir="${project.build.directory}" includes="launcher-win32*.tar.gz"/>
+                </untar>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <!-- Copy plugins and features -->
+          <execution>
+            <id>copy-plugins-features</id>
+            <phase>process-resources</phase>
+            <configuration>
+              <tasks>
+                <copy todir="${plugins-dir}">
+                  <fileset dir="${project.build.directory}/application-plugins-${project.version}" />
+                  <fileset dir="${project.build.directory}/application-eclipse-plugins-${project.version}" />
+                </copy>
+                <copy todir="${features-dir}">
+                  <fileset dir="${project.build.directory}/application-features-${project.version}" />
+                </copy>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>studio-maven-plugin</artifactId>
+        <executions>
+          <!-- Copy specific plugins for Win32 -->
+          <execution>
+            <id>copy-plugins-win32</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-eclipse-artifact</goal>
+            </goals>
+            <configuration>
+              <destinationDirectory>${plugins-dir}</destinationDirectory>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.eclipse.core.filesystem.win32</groupId>
+                  <artifactId>x86</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.eclipse.swt.win32.win32</groupId>
+                  <artifactId>x86</artifactId>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <!-- Unpack specific plugins for Win32 -->
+          <execution>
+          <id>unpack-plugins-win32</id>
+          <phase>generate-resources</phase>
+          <goals>
+            <goal>unpack-with-artifactid-prefix</goal>
+          </goals>
+          <configuration>
+            <outputDirectory>${plugins-dir}</outputDirectory>
+            <artifactItems>
+              <artifactItem>
+                <groupId>org.eclipse.equinox.launcher.win32.win32</groupId>
+                <artifactId>x86</artifactId>
+                <type>zip</type>
+              </artifactItem>
+            </artifactItems>
+          </configuration>
+        </execution>
+        </executions>
+      </plugin>
+  
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <!-- Create the distribution file -->
+          <execution>
+            <id>assembly-distribution-win32</id>
+            <phase>package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assembly/application.xml</descriptor>
+              </descriptors>
+            </configuration>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  
+</project>

Added: directory/studio/branches/studio-improved-build/application/application-win32/src/main/assembly/application.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-win32/src/main/assembly/application.xml?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-win32/src/main/assembly/application.xml (added)
+++ directory/studio/branches/studio-improved-build/application/application-win32/src/main/assembly/application.xml Tue Jun  8 17:39:15 2010
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+<!-- $Rev:  $ $Date:  $ -->
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+    <id></id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <!-- Application files except the main executable -->
+        <fileSet>
+            <directory>${app-dir}</directory>
+            <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>Apache Directory Studio.exe</exclude>
+            </excludes>
+            <fileMode>644</fileMode>
+        </fileSet>
+        
+        <!-- Application executable -->
+        <fileSet>
+            <directory>${app-dir}</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>Apache Directory Studio.exe</include>
+            </includes>
+            <fileMode>755</fileMode>
+        </fileSet>
+        
+        <!-- Configuration file -->
+        <fileSet>
+            <directory>src/main/configuration</directory>
+            <outputDirectory>/configuration</outputDirectory>
+            <includes>
+                <include>config.ini</include>
+            </includes>
+            <fileMode>644</fileMode>
+        </fileSet>
+        
+        <!-- Legal files & release notes -->
+        <fileSet>
+            <directory>../../docs</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+                <include>Release Notes.txt</include>
+            </includes>
+            <fileMode>644</fileMode>
+        </fileSet>
+    </fileSets>
+</assembly>

Added: directory/studio/branches/studio-improved-build/application/application-win32/src/main/configuration/config.ini
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-win32/src/main/configuration/config.ini?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-win32/src/main/configuration/config.ini (added)
+++ directory/studio/branches/studio-improved-build/application/application-win32/src/main/configuration/config.ini Tue Jun  8 17:39:15 2010
@@ -0,0 +1,12 @@
+#Product Runtime Configuration File
+
+osgi.splashPath=platform:/base/plugins/org.apache.directory.studio.rcp
+eclipse.product=org.apache.directory.studio.rcp.product
+osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.core.runtime@start
+osgi.bundles.defaultStartLevel=4
+
+# Use system small fonts (Mac OS X only)
+org.eclipse.swt.internal.carbon.smallFonts=true
+
+# The workspace location
+osgi.instance.area.default=@user.home/.ApacheDirectoryStudio

Added: directory/studio/branches/studio-improved-build/application/application-win32/src/main/site/site.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-win32/src/main/site/site.xml?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-win32/src/main/site/site.xml (added)
+++ directory/studio/branches/studio-improved-build/application/application-win32/src/main/site/site.xml Tue Jun  8 17:39:15 2010
@@ -0,0 +1,26 @@
+<?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 name="${project.name}">
+  <body>
+    <menu ref="parent" />
+    <menu ref="reports" />
+  </body>
+</project>

Added: directory/studio/branches/studio-improved-build/application/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/pom.xml?rev=952747&view=auto
==============================================================================
--- directory/studio/branches/studio-improved-build/application/pom.xml (added)
+++ directory/studio/branches/studio-improved-build/application/pom.xml Tue Jun  8 17:39:15 2010
@@ -0,0 +1,135 @@
+<?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>1.5.4-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>application</artifactId>
+  <name>Apache Directory Studio Application</name>
+  <packaging>pom</packaging>
+  
+  <properties>
+    <studio-dir>${project.build.directory}/ApacheDirectoryStudio</studio-dir>
+  </properties>
+  
+  <modules>
+    <module>application-features</module>
+    <module>application-plugins</module>
+    <module>application-eclipse-plugins</module>
+  </modules>
+  
+  <profiles>
+    <profile>
+      <id>linux-x86</id>
+      <activation>
+        <os>
+          <arch>i386</arch>
+          <family>unix</family>
+          <name>linux</name>
+        </os>
+      </activation>
+      <modules>
+        <module>application-linux-x86</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>linux-x86_64</id>
+      <activation>
+        <os>
+          <arch>amd64</arch>
+          <family>unix</family>
+          <name>linux</name>
+        </os>
+      </activation>
+      <modules>
+        <module>application-linux-x86_64</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>win32</id>
+      <activation>
+        <os>
+          <arch>x86</arch>
+          <family>windows</family>
+        </os>
+      </activation>
+      <modules>
+        <module>application-win32</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>macosx</id>
+      <activation>
+        <os>
+          <family>unix</family>
+          <name>mac os x</name>
+        </os>
+      </activation>
+      <modules>
+        <module>application-macosx</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>updatesite</id>
+      <modules>
+        <module>application-updatesite</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>unpack</id>
+      <activation>
+        <file>
+          <exists>pom.xml</exists>
+        </file>
+      </activation>
+      <modules>
+        <module>application-unpack</module>
+      </modules>
+    </profile>
+  </profiles>
+  
+  <build>
+    <plugins>
+      <!-- Overwritten configuration from the Directory Project pom -->
+      <plugin>
+        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+        <artifactId>tools-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>verify-legal-files</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>verify-legal-files</goal>
+            </goals>
+            <configuration>
+              <strict>false</strict>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  
+</project>

Modified: directory/studio/branches/studio-improved-build/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/pom.xml?rev=952747&r1=952746&r2=952747&view=diff
==============================================================================
--- directory/studio/branches/studio-improved-build/pom.xml (original)
+++ directory/studio/branches/studio-improved-build/pom.xml Tue Jun  8 17:39:15 2010
@@ -160,8 +160,8 @@
         </file>
       </activation>
       <modules>
-        <module>updatesite</module>
-        <module>studio</module>
+        <!--<module>updatesite</module>-->
+        <module>application</module>
       </modules>
     </profile>
   </profiles>



Mime
View raw message