updates in support of release

license formatting version bump adding back in win32 build and assemblyi upgraded jargon fixed NPE in staging areas context menu increased size of ACL decor added delete descriptions command for any arrangement selection
UNC-Libraries · Jun 12, 2014 · 8ddeefb · 8ddeefb
1 parent 11960cd
commit 8ddeefb
Show file tree

Hide file tree

Showing 31 changed files with 267 additions and 63 deletions.
diff --git a/eclipse-repository/bundleJREs/win32.win32.x86-assembly.xml b/eclipse-repository/bundleJREs/win32.win32.x86-assembly.xml
@@ -0,0 +1,35 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>win32.win32.x86-jre</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <baseDirectory>curators-workbench</baseDirectory>
+  <fileSets>
+    <fileSet>
+      <outputDirectory>/</outputDirectory>
+      <directory>${basedir}/target/products/curators-workbench/win32/win32/x86/curators-workbench</directory>
+      <includes>
+        <include>**</include>
+      </includes>
+    </fileSet>
+
+    <fileSet>
+      <outputDirectory>/jre</outputDirectory>
+      <directory>${bundleJREs.dir}/windows-i586/jre${jre.version}</directory>
+      <includes>
+        <include>**</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+
+  <files>
+    <file>
+      <source>${bundleJREs.dir}/windows-i586/jre${jre.version}/bin/java.exe</source>
+      <outputDirectory>/jre/bin</outputDirectory>
+      <filtered>false</filtered>
+      <fileMode>755</fileMode>
+    </file>
+  </files>
+</assembly>
diff --git a/eclipse-repository/category.xml b/eclipse-repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/workbench_feature_4.1.4.qualifier.jar" id="workbench_feature" version="4.1.4.qualifier">
+   <feature url="features/workbench_feature_4.1.5.qualifier.jar" id="workbench_feature" version="4.1.5.qualifier">
       <category name="workbench_category_id"/>
    </feature>
    <category-def name="workbench_category_id" label="Curator&apos;s Workbench Category">

diff --git a/eclipse-repository/pom.xml b/eclipse-repository/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>curators.workbench</groupId>
 		<artifactId>parent</artifactId>
-		<version>4.1.4-SNAPSHOT</version>
+		<version>4.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>eclipse-repository</artifactId>
 	<packaging>eclipse-repository</packaging>
@@ -182,6 +182,7 @@
 						<configuration>
 							<descriptors>
 								<descriptor>bundleJREs/macosx.cocoa.x86_64-app-assembly.xml</descriptor>
+								<descriptor>bundleJREs/win32.win32.x86-assembly.xml</descriptor>
 								<descriptor>bundleJREs/win32.win32.x86_64-assembly.xml</descriptor>
 								<descriptor>bundleJREs/linux.gtk.x86_64-assembly.xml</descriptor>
 							</descriptors>

diff --git a/eclipse-repository/workbench.product b/eclipse-repository/workbench.product
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Curator&apos;s Workbench" uid="curators-workbench" id="workbench_plugin.eclipse-repository" application="workbench_plugin.application" version="4.1.4.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Curator&apos;s Workbench" uid="curators-workbench" id="workbench_plugin.eclipse-repository" application="workbench_plugin.application" version="4.1.5.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/workbench_plugin/about.png"/>
       <text>
-         Curator&apos;s Workbench, version 4.1.4
+         Curator&apos;s Workbench, version 4.1.5
 
 The Curator&apos;s Workbench is a project of the Carolina Digital Repository, created by the University Libraries of UNC Chapel Hill.
 http://cdr.unc.edu
@@ -90,7 +90,7 @@ limitations under the License.
    </plugins>
 
    <features>
-      <feature id="workbench_feature" version="4.1.4.qualifier"/>
+      <feature id="workbench_feature" version="4.1.5.qualifier"/>
    </features>
 
    <configurations>

diff --git a/irods-efs.plugin/META-INF/MANIFEST.MF b/irods-efs.plugin/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: irods-efs.plugin
 Bundle-SymbolicName: irods-efs.plugin;singleton:=true
-Bundle-Version: 4.1.4.qualifier
+Bundle-Version: 4.1.5.qualifier
 Bundle-Activator: irods.efs.plugin.Activator
 Bundle-Vendor: University Libraries, UNC Chapel Hill
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.core.filesystem,
- org.irods.jargon.core;bundle-version="[3.2.1.4,3.2.2)",
+ org.irods.jargon.core;bundle-version="[3.3.2,3.3.3)",
  org.ops4j.pax.logging.pax-logging-api;bundle-version="1.7.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy

diff --git a/irods-efs.plugin/pom.xml b/irods-efs.plugin/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>curators.workbench</groupId>
 		<artifactId>parent</artifactId>
-		<version>4.1.4-SNAPSHOT</version>
+		<version>4.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>irods-efs.plugin</artifactId>
 	<packaging>eclipse-plugin</packaging>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>curators.workbench</groupId>
 	<artifactId>parent</artifactId>
-	<version>4.1.4-SNAPSHOT</version>
+	<version>4.1.5-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<inceptionYear>2010</inceptionYear>
 	<properties>
@@ -14,7 +14,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring.version>3.0.6.RELEASE</spring.version>
-		<jre.version>1.7.0_40</jre.version>
+		<jre.version>1.7.0_60</jre.version>
 	</properties>
 	<developers>
 		<developer>

diff --git a/staging/META-INF/MANIFEST.MF b/staging/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: staging.plugin
 Bundle-SymbolicName: staging.plugin;singleton:=true
-Bundle-Version: 4.1.4.qualifier
+Bundle-Version: 4.1.5.qualifier
 Bundle-Activator: staging.plugin.StagingPlugin
 Bundle-Vendor: University Libraries, UNC Chapel Hill
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.core.filesystem,
  org.apache.commons.codec;bundle-version="1.3.0",
- irods-efs.plugin;bundle-version="4.1.4";visibility:=reexport,
+ irods-efs.plugin;bundle-version="4.1.5";visibility:=reexport,
  org.junit,
  edu.unc.lib.cdr.staging-areas;bundle-version="0.0.1";visibility:=reexport,
  org.ops4j.pax.logging.pax-logging-api;bundle-version="1.7.1"

diff --git a/staging/pom.xml b/staging/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>curators.workbench</groupId>
 		<artifactId>parent</artifactId>
-		<version>4.1.4-SNAPSHOT</version>
+		<version>4.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>staging.plugin</artifactId>
 	<packaging>eclipse-plugin</packaging>

diff --git a/staging/src/main/java/staging/plugin/EFSResolver.java b/staging/src/main/java/staging/plugin/EFSResolver.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2010 The University of North Carolina at Chapel Hill
+ *
+ * Licensed 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.
+ */
 package staging.plugin;
 
 import java.net.URI;

diff --git a/staging/src/main/java/staging/plugin/IRODSURLStreamHandler.java b/staging/src/main/java/staging/plugin/IRODSURLStreamHandler.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2010 The University of North Carolina at Chapel Hill
+ *
+ * Licensed 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.
+ */
 package staging.plugin;
 
 import java.io.IOException;

diff --git a/staging/src/main/java/staging/plugin/IRODSURLStreamHandlerFactory.java b/staging/src/main/java/staging/plugin/IRODSURLStreamHandlerFactory.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2010 The University of North Carolina at Chapel Hill
+ *
+ * Licensed 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.
+ */
 package staging.plugin;
 
 import java.io.IOException;

diff --git a/staging/src/main/java/staging/plugin/StagingAreaPreferenceInitializer.java b/staging/src/main/java/staging/plugin/StagingAreaPreferenceInitializer.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2010 The University of North Carolina at Chapel Hill
+ *
+ * Licensed 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.
+ */
 package staging.plugin;
 
 import java.io.BufferedReader;

diff --git a/staging/src/main/java/staging/plugin/StagingPlugin.java b/staging/src/main/java/staging/plugin/StagingPlugin.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2010 The University of North Carolina at Chapel Hill
+ *
+ * Licensed 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.
+ */
 package staging.plugin;
 
 import java.beans.PropertyChangeEvent;

diff --git a/staging/src/main/java/staging/plugin/WorkbenchPreferencePage.java b/staging/src/main/java/staging/plugin/WorkbenchPreferencePage.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2010 The University of North Carolina at Chapel Hill
+ *
+ * Licensed 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.
+ */
 package staging.plugin;
 
 import java.net.URI;