directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r663751 - in /directory/studio/trunk: pom.xml rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java repository/pom.xml studio/pom.xml
Date Thu, 05 Jun 2008 21:44:40 GMT
Author: pamarcelot
Date: Thu Jun  5 14:44:40 2008
New Revision: 663751

URL: http://svn.apache.org/viewvc?rev=663751&view=rev
Log:
Fix for DIRSTUDIO-339 (Add the 'org.eclipse.ui.carbon' Eclipse plugin to the Mac OS X distribution).

Modified:
    directory/studio/trunk/pom.xml
    directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java
    directory/studio/trunk/repository/pom.xml
    directory/studio/trunk/studio/pom.xml

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=663751&r1=663750&r2=663751&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Thu Jun  5 14:44:40 2008
@@ -1476,6 +1476,11 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.ui</groupId>
+        <artifactId>carbon</artifactId>
+        <version>3.2.100-I20070605-0010</version>
+      </dependency>
 
       <!-- Apache Directory Studio -->
       <dependency>

Modified: directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java?rev=663751&r1=663750&r2=663751&view=diff
==============================================================================
--- directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java
(original)
+++ directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java
Thu Jun  5 14:44:40 2008
@@ -26,6 +26,7 @@
 import org.apache.directory.studio.actions.ReportABugAction;
 import org.apache.directory.studio.actions.UpdateAction;
 import org.apache.directory.studio.view.ImageKeys;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.IContributionItem;
 import org.eclipse.jface.action.ICoolBarManager;
@@ -57,6 +58,7 @@
  */
 public class ApplicationActionBarAdvisor extends ActionBarAdvisor
 {
+    private static final String OS_MACOSX = "macosx";
     private OpenFileAction openFileAction;
     private IWorkbenchAction closeAction;
     private IWorkbenchAction closeAllAction;
@@ -266,11 +268,17 @@
      */
     protected void fillMenuBar( IMenuManager menuBar )
     {
+        // Getting the OS
+        String os = Platform.getOS();
+
+        // Creating menus
         MenuManager fileMenu = new MenuManager( "&File", IWorkbenchActionConstants.M_FILE
); //$NON-NLS-1$
         MenuManager editMenu = new MenuManager( "&Edit", IWorkbenchActionConstants.M_EDIT
); //$NON-NLS-1$
         MenuManager navigateMenu = new MenuManager( "&Navigate", IWorkbenchActionConstants.M_NAVIGATE
); //$NON-NLS-1$
         MenuManager windowMenu = new MenuManager( "&Window", IWorkbenchActionConstants.M_WINDOW
); //$NON-NLS-1$
         MenuManager helpMenu = new MenuManager( "&Help", IWorkbenchActionConstants.M_HELP
); //$NON-NLS-1$
+        MenuManager hiddenMenu = new MenuManager( "Hidden", IWorkbenchActionConstants.M_HELP
); //$NON-NLS-1$
+        hiddenMenu.setVisible( false );
 
         // Adding menus
         menuBar.add( fileMenu );
@@ -280,6 +288,7 @@
         menuBar.add( new GroupMarker( IWorkbenchActionConstants.MB_ADDITIONS ) );
         menuBar.add( windowMenu );
         menuBar.add( helpMenu );
+        menuBar.add( hiddenMenu );
 
         // Populating File Menu
         fileMenu.add( newAction );
@@ -346,14 +355,23 @@
         windowMenu.add( new Separator() );
         windowMenu.add( closePerspectiveAction );
         windowMenu.add( closeAllPerspectivesAction );
-        windowMenu.add( new Separator() );
-        windowMenu.add( preferencesAction );
+        if ( ApplicationActionBarAdvisor.OS_MACOSX.equalsIgnoreCase( os ) )
+        {
+            // We hide the preferences action, it will be added by the "Carbon" plugin
+            hiddenMenu.add( preferencesAction );
+        }
+        else
+        {
+            windowMenu.add( new Separator() );
+            windowMenu.add( preferencesAction );
+        }
 
         // Help
         helpMenu.add( introAction );
         helpMenu.add( new Separator() );
         helpMenu.add( helpAction );
         helpMenu.add( dynamicHelpAction );
+        helpMenu.add( new Separator() );
         helpMenu.add( reportABug );
         helpMenu.add( new Separator() );
         MenuManager softwareUpdates = new MenuManager( Messages
@@ -361,8 +379,16 @@
         softwareUpdates.add( updateAction );
         softwareUpdates.add( manageConfigurationAction );
         helpMenu.add( softwareUpdates );
-        helpMenu.add( new Separator() );
-        helpMenu.add( aboutAction );
+        if ( ApplicationActionBarAdvisor.OS_MACOSX.equalsIgnoreCase( os ) )
+        {
+            // We hide the about action, it will be added by the "Carbon" plugin
+            hiddenMenu.add( aboutAction );
+        }
+        else
+        {
+            helpMenu.add( new Separator() );
+            helpMenu.add( aboutAction );
+        }
     }
 
 
@@ -389,7 +415,5 @@
         navToolBar.add( backwardHistoryAction );
         navToolBar.add( forwardHistoryAction );
         coolBar.add( new ToolBarContributionItem( navToolBar, IWorkbenchActionConstants.TOOLBAR_NAVIGATE
) );
-
     }
-
 }

Modified: directory/studio/trunk/repository/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/pom.xml?rev=663751&r1=663750&r2=663751&view=diff
==============================================================================
--- directory/studio/trunk/repository/pom.xml (original)
+++ directory/studio/trunk/repository/pom.xml Thu Jun  5 14:44:40 2008
@@ -1,25 +1,25 @@
-<?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.
--->
-
-<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">
+<?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.
+-->
+
+<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>
@@ -31,11 +31,11 @@
   <version>${repository.version}</version>
   <name>Apache Directory Studio Repository</name>
   <packaging>pom</packaging>
-
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org</url>
-  </organization>
+
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org</url>
+  </organization>
 
   <dependencies>
     <!-- Apache Directory Studio launchers binaries -->
@@ -411,6 +411,10 @@
       <groupId>org.eclipse</groupId>
       <artifactId>tomcat</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.ui</groupId>
+      <artifactId>carbon</artifactId>
+    </dependency>
 
     <!-- Other dependencies -->
     <dependency>

Modified: directory/studio/trunk/studio/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio/pom.xml?rev=663751&r1=663750&r2=663751&view=diff
==============================================================================
--- directory/studio/trunk/studio/pom.xml (original)
+++ directory/studio/trunk/studio/pom.xml Thu Jun  5 14:44:40 2008
@@ -1,25 +1,25 @@
-<?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.
--->
-
-<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">
+<?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.
+-->
+
+<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>
@@ -36,7 +36,7 @@
   <properties>
     <studio-dir>target/ApacheDirectoryStudio</studio-dir>
   </properties>
-
+
   <!-- 
     How building a dist works:
     We presume that all needed dependencies are already somehow available (normally this
is the case with mvn install from root)
@@ -180,27 +180,27 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>deploy-dist-linux-x86</id>
-                <phase>deploy</phase>
-                <configuration>
-                  <file>../target/distributions/ApacheDirectoryStudio-linux-x86-${pom.version}-dist.tar.gz</file>
-                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
-                  <artifactId>ApacheDirectoryStudio</artifactId>
-                  <groupId>${pom.groupId}</groupId>
-                  <packaging>tar.gz</packaging>
-                  <version>${pom.version}-linux-x86</version>
-                  <uniqueVersion>false</uniqueVersion>
-                </configuration>
-                <goals>
-                  <goal>deploy-file</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
+          <plugin>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>deploy-dist-linux-x86</id>
+                <phase>deploy</phase>
+                <configuration>
+                  <file>../target/distributions/ApacheDirectoryStudio-linux-x86-${pom.version}-dist.tar.gz</file>
+                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
+                  <artifactId>ApacheDirectoryStudio</artifactId>
+                  <groupId>${pom.groupId}</groupId>
+                  <packaging>tar.gz</packaging>
+                  <version>${pom.version}-linux-x86</version>
+                  <uniqueVersion>false</uniqueVersion>
+                </configuration>
+                <goals>
+                  <goal>deploy-file</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
@@ -329,28 +329,28 @@
                 </goals>
               </execution>
             </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>deploy-dist-linux-x86_64</id>
-                <phase>deploy</phase>
-                <configuration>
-                  <file>../target/distributions/ApacheDirectoryStudio-linux-x86_64-${pom.version}-dist.tar.gz</file>
-                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
-                  <artifactId>ApacheDirectoryStudio</artifactId>
-                  <groupId>${pom.groupId}</groupId>
-                  <packaging>tar.gz</packaging>
-                  <version>${pom.version}-linux-x86_64</version>
-                  <uniqueVersion>false</uniqueVersion>
-                </configuration>
-                <goals>
-                  <goal>deploy-file</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
+          </plugin>
+          <plugin>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>deploy-dist-linux-x86_64</id>
+                <phase>deploy</phase>
+                <configuration>
+                  <file>../target/distributions/ApacheDirectoryStudio-linux-x86_64-${pom.version}-dist.tar.gz</file>
+                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
+                  <artifactId>ApacheDirectoryStudio</artifactId>
+                  <groupId>${pom.groupId}</groupId>
+                  <packaging>tar.gz</packaging>
+                  <version>${pom.version}-linux-x86_64</version>
+                  <uniqueVersion>false</uniqueVersion>
+                </configuration>
+                <goals>
+                  <goal>deploy-file</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
@@ -480,27 +480,27 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>deploy-dist-linux-ppc</id>
-                <phase>deploy</phase>
-                <configuration>
-                  <file>../target/distributions/ApacheDirectoryStudio-linux-ppc-${pom.version}-dist.tar.gz</file>
-                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
-                  <artifactId>ApacheDirectoryStudio</artifactId>
-                  <groupId>${pom.groupId}</groupId>
-                  <packaging>tar.gz</packaging>
-                  <version>${pom.version}-linux-ppc</version>
-                  <uniqueVersion>false</uniqueVersion>
-                </configuration>
-                <goals>
-                  <goal>deploy-file</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
+          <plugin>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>deploy-dist-linux-ppc</id>
+                <phase>deploy</phase>
+                <configuration>
+                  <file>../target/distributions/ApacheDirectoryStudio-linux-ppc-${pom.version}-dist.tar.gz</file>
+                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
+                  <artifactId>ApacheDirectoryStudio</artifactId>
+                  <groupId>${pom.groupId}</groupId>
+                  <packaging>tar.gz</packaging>
+                  <version>${pom.version}-linux-ppc</version>
+                  <uniqueVersion>false</uniqueVersion>
+                </configuration>
+                <goals>
+                  <goal>deploy-file</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
@@ -629,27 +629,27 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>deploy-dist-win32</id>
-                <phase>deploy</phase>
-                <configuration>
-                  <file>../target/distributions/ApacheDirectoryStudio-win32-${pom.version}-dist.zip</file>
-                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
-                  <artifactId>ApacheDirectoryStudio</artifactId>
-                  <groupId>${pom.groupId}</groupId>
-                  <packaging>zip</packaging>
-                  <version>${pom.version}-win32</version>
-                  <uniqueVersion>false</uniqueVersion>
-                </configuration>
-                <goals>
-                  <goal>deploy-file</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
+          <plugin>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>deploy-dist-win32</id>
+                <phase>deploy</phase>
+                <configuration>
+                  <file>../target/distributions/ApacheDirectoryStudio-win32-${pom.version}-dist.zip</file>
+                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
+                  <artifactId>ApacheDirectoryStudio</artifactId>
+                  <groupId>${pom.groupId}</groupId>
+                  <packaging>zip</packaging>
+                  <version>${pom.version}-win32</version>
+                  <uniqueVersion>false</uniqueVersion>
+                </configuration>
+                <goals>
+                  <goal>deploy-file</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
@@ -689,11 +689,16 @@
                       <outputDirectory>${studio-dir}-macosx</outputDirectory>
                     </artifactItem>
                     <artifactItem>
-                    <groupId>org.eclipse.equinox.launcher.carbon</groupId>
+                      <groupId>org.eclipse.equinox.launcher.carbon</groupId>
                       <artifactId>macosx</artifactId>
                       <type>tar.gz</type>
                       <outputDirectory>${studio-dir}-macosx</outputDirectory>
                     </artifactItem>
+                    <artifactItem>
+                      <groupId>org.eclipse.ui</groupId>
+                      <artifactId>carbon</artifactId>
+                      <outputDirectory>${studio-dir}-macosx/Apache Directory Studio.app/Contents/Resources/Java/plugins</outputDirectory>
+                    </artifactItem>
                   </artifactItems>
                 </configuration>
               </execution>
@@ -744,27 +749,27 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>deploy-dist-macosx</id>
-                <phase>deploy</phase>
-                <configuration>
-                  <file>../target/distributions/ApacheDirectoryStudio-macosx-${pom.version}-dist.tar.gz</file>
-                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
-                  <artifactId>ApacheDirectoryStudio</artifactId>
-                  <groupId>${pom.groupId}</groupId>
-                  <packaging>tar.gz</packaging>
-                  <version>${pom.version}-macosx</version>
-                  <uniqueVersion>false</uniqueVersion>
-                </configuration>
-                <goals>
-                  <goal>deploy-file</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
+          <plugin>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>deploy-dist-macosx</id>
+                <phase>deploy</phase>
+                <configuration>
+                  <file>../target/distributions/ApacheDirectoryStudio-macosx-${pom.version}-dist.tar.gz</file>
+                  <url>${pom.distributionManagement.snapshotRepository.url}</url>
+                  <artifactId>ApacheDirectoryStudio</artifactId>
+                  <groupId>${pom.groupId}</groupId>
+                  <packaging>tar.gz</packaging>
+                  <version>${pom.version}-macosx</version>
+                  <uniqueVersion>false</uniqueVersion>
+                </configuration>
+                <goals>
+                  <goal>deploy-file</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>org.apache.directory.studio</groupId>
             <artifactId>maven-studio-plugin</artifactId>
@@ -1249,25 +1254,25 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-
-      <!-- FIXME enable check for legal file -->
-      <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>
-              <!-- Fail the build if no legal files were found -->
-              <strict>false</strict>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
+
+      <!-- FIXME enable check for legal file -->
+      <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>
+              <!-- Fail the build if no legal files were found -->
+              <strict>false</strict>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 



Mime
View raw message