Refactors package names and structure to hs-hannover.de domain (inclu…

…ding license headers, pom.xml, etc)
trustathsh · Dec 18, 2013 · 8f33d5b · 8f33d5b
1 parent caf120f
commit 8f33d5b
Show file tree

Hide file tree

Showing 104 changed files with 1,471 additions and 4,414 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,59 +1,119 @@
+0.4.1 -> 0.4.2
+* changed to ifmapj-1.0.0
+* refactored package names and structure to hs-hannover.de domain (including license headers, pom.xml, etc)"
+* changed old Trust@FHH logo to new Trust@HsH logo
+
 0.4.0 -> 0.4.1
 * changed from Ant to Maven
 * changed to ifmapj-0.1.5
 
-0.3.3 -> 0.4.0
-* irongui is now limited to one subscription to avoid confusion
-* added menu panel
-* toolbar-panel rework
-* icons for dialogs
-* links on logos readded
-* connection-dialog rework
-* tab-header rework
-* helper-class for loading icons
-* about dialog
-* some minor fixes
-
-0.3.2 -> 0.3.3
-* ifmapj-dump dropped, changed to ifmapj-0.1.4
-* the main subscription-panel is reworked (ip-range is removed, ipv6 is now working)
-* by clicking connect, the choosen connection in navigation-panel is established
-* the connection-dialog now has a duplicate-button
-* the status-panel is reactivated
-* fixed: Quick-Subscribe now working with all identifiers
-* fixed: refresh of detail-view on removing metadata
-* fixed: crash by connecting to an non-running ifmap-server
-* fixed: sometimes not all metadata is removed
-* some minor fixes
-* new keystore and certificate
-
-0.3.1 -> 0.3.2
-* fixed broken Subscribe Panel
-* Quick Subscribe is still buggy for identity identifiers :(
-* include ifmapj-dump sources
-
-0.3.0 -> 0.3.1
-* A lot of bugfixes ...
-* Overall stability should be better now
-* Some known issues with prefuse still present though (if irongui crashes,
-  just restart it ... )
-
-0.2.0 -> 0.3.0
-* Changed to ifmapj, dropped apache axis (all basic operations + dump)
-* Bug fix: delete-anomaly on cutting subscriptions
-* Bug fix: multiValue-data not showed
-* Bug fix: subscriptions on identities didnt work
-* Tooltips rework
-* Bezier-curves instead of directed lines
-* Some minor refactoring/bug fixing
-
-0.1.1 -> 0.2.0
-* new branch 0.2.0
-* fixed: changed max-depth in subscriptionUpdate to 1
-* rework of the subscription-panel
-* rework of the datastructure
-
-0.1.0 -> 0.1.1
-* fixed: missing picture added
-* fixed: if the poll-thread isnt alive anymore, now we create a new thread instead of starting the old one again (a thread which run()-method is done, shouldn`t be start anymore)
-* added new certificates
+0.3.3 -> 0.4.0
+
+* irongui is now limited to one subscription to avoid confusion
+
+* added menu panel
+
+* toolbar-panel rework
+
+* icons for dialogs
+
+* links on logos readded
+
+* connection-dialog rework
+
+* tab-header rework
+
+* helper-class for loading icons
+
+* about dialog
+
+* some minor fixes
+
+
+
+0.3.2 -> 0.3.3
+
+* ifmapj-dump dropped, changed to ifmapj-0.1.4
+
+* the main subscription-panel is reworked (ip-range is removed, ipv6 is now working)
+
+* by clicking connect, the choosen connection in navigation-panel is established
+
+* the connection-dialog now has a duplicate-button
+
+* the status-panel is reactivated
+
+* fixed: Quick-Subscribe now working with all identifiers
+
+* fixed: refresh of detail-view on removing metadata
+
+* fixed: crash by connecting to an non-running ifmap-server
+
+* fixed: sometimes not all metadata is removed
+
+* some minor fixes
+
+* new keystore and certificate
+
+
+
+0.3.1 -> 0.3.2
+
+* fixed broken Subscribe Panel
+
+* Quick Subscribe is still buggy for identity identifiers :(
+
+* include ifmapj-dump sources
+
+
+
+0.3.0 -> 0.3.1
+
+* A lot of bugfixes ...
+
+* Overall stability should be better now
+
+* Some known issues with prefuse still present though (if irongui crashes,
+
+  just restart it ... )
+
+
+
+0.2.0 -> 0.3.0
+
+* Changed to ifmapj, dropped apache axis (all basic operations + dump)
+
+* Bug fix: delete-anomaly on cutting subscriptions
+
+* Bug fix: multiValue-data not showed
+
+* Bug fix: subscriptions on identities didnt work
+
+* Tooltips rework
+
+* Bezier-curves instead of directed lines
+
+* Some minor refactoring/bug fixing
+
+
+
+0.1.1 -> 0.2.0
+
+* new branch 0.2.0
+
+* fixed: changed max-depth in subscriptionUpdate to 1
+
+* rework of the subscription-panel
+
+* rework of the datastructure
+
+
+
+0.1.0 -> 0.1.1
+
+* fixed: missing picture added
+
+* fixed: if the poll-thread isnt alive anymore, now we create a new thread instead of starting the old one again (a thread which run()-method is done, shouldn`t be start anymore)
+
+* added new certificates
+
diff --git a/README.txt b/README.txt
@@ -26,7 +26,7 @@ The development was started within the bachelor
 thesis of Tobias Ruhe at Hochschule Hannover (University of
 Applied Sciences and Arts Hannover). irongui is now maintained
 and extended within the ESUKOM research project. More information
-can be found at the Trust@FHH website [2].
+can be found at the Trust@HsH website [2].
 
 
 Software Requirements
@@ -99,7 +99,7 @@ URLs
 ====
 [1] http://www.trustedcomputinggroup.org/developers/trusted_network_connect
 
-[2] http://trust.inform.fh-hannover.de
+[2] http://trust.f4.hs-hannover.de
 
 [3] http://www.apache.org/licenses/LICENSE-2.0.html
 
diff --git a/pom.xml b/pom.xml
@@ -8,18 +8,18 @@
 	</properties>
 
 	<!-- general project information -->
-	<groupId>de.fhhannover.inform.trust</groupId>
+	<groupId>de.hshannover.f4.trust</groupId>
 	<artifactId>irongui</artifactId>
-	<version>0.4.1</version>
+	<version>0.4.2</version>
 	<packaging>jar</packaging>
 	<name>irongui</name>
-	<url>http://trust.inform.fh-hannover.de</url>
+	<url>http://trust.f4.hs-hannover.de</url>
 	<description>
 		an IF-MAP 2.0 visualization client
 	</description>
 	<organization>
-		<name>Trust@FHH</name>
-		<url>http://trust.inform.fh-hannover.de</url>
+		<name>Trust@HsH</name>
+		<url>http://trust.f4.hs-hannover.de</url>
 	</organization>
 
 	<!-- the project license -->
@@ -34,32 +34,30 @@
 
 	<!-- the core developers of the project -->
 	<developers>
-		<developer>
-			<id>tr</id>
-			<name>Tobias Ruhe</name>
-			<email>[email protected]</email>
-		</developer>
+    	<developer>
+    		<name>Trust@HsH</name>
+			<email>[email protected]</email>
+    	</developer>
 	</developers>
 
 	<!-- the contributors of the project -->
 	<contributors>
+		<contributor>
+			<name>Tobias Ruhe</name>
+		</contributor>
 		<contributor>
 			<name>Bastian Hellmann</name>
-			<email>[email protected]</email>
 		</contributor>
 		<contributor>
 			<name>Arne Welzel</name>
-			<email>[email protected]</email>
 		</contributor>
 		<contributor>
 			<name>Ingo Bente</name>
-			<email>[email protected]</email>
 		</contributor>
 	</contributors>
 
 	<build>
 		<plugins>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -77,7 +75,7 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>de.fhhannover.inform.ifmap.Client</mainClass>
+							<mainClass>de.hshannover.f4.trust.irongui.Client</mainClass>
 							<addClasspath>true</addClasspath>
 						</manifest>
 						<manifestEntries>
@@ -108,21 +106,14 @@
 				<configuration>
 					<licenseName>apache_v2</licenseName>
 					<canUpdateDescription>true</canUpdateDescription>
+					<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
 					<descriptionTemplate>${basedir}/src/license/description_template.ftl</descriptionTemplate>
 					<roots>
 						<root>src/main/java</root>
 						<root>src/test/java</root>
 					</roots>
 				</configuration>
-				<executions>
-					<execution>
-						<id>first</id>
-						<goals>
-							<goal>update-file-header</goal>
-						</goals>
-						<phase>process-sources</phase>
-					</execution>
-				</executions>
+
 			</plugin>
 
 		</plugins>
@@ -155,9 +146,9 @@
     	</dependency>
 
 		<dependency>
-			<groupId>de.fhhannover.inform.trust</groupId>
+			<groupId>de.hshannover.f4.trust</groupId>
 			<artifactId>ifmapj</artifactId>
-			<version>0.1.5</version>
+			<version>1.0.0</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/src/license/description_template.ftl b/src/license/description_template.ftl
@@ -1,78 +1,32 @@
-<#--
- #%L
- ====================================================
-   _____                _     ____  _____ _   _ _   _
-  |_   _|_ __ _   _ ___| |_  / __ \|  ___| | | | | | |
-    | | | '__| | | / __| __|/ / _` | |_  | |_| | |_| |
-    | | | |  | |_| \__ \ |_| | (_| |  _| |  _  |  _  |
-    |_| |_|   \__,_|___/\__|\ \__,_|_|   |_| |_|_| |_|
-                             \____/
- 
- =====================================================
- 
- Hochschule Hannover 
- (University of Applied Sciences and Arts, Hannover)
- Faculty IV, Dept. of Computer Science
- Ricklinger Stadtweg 118, 30459 Hannover, Germany
- 
- Email: [email protected]
- Website: http://trust.inform.fh-hannover.de/
- 
- This file is part of irongui, version 0.4.1, implemented by the Trust@FHH 
- research group at the Hochschule Hannover, a program to visualize the content
- of a MAP Server (MAPS), a crucial component within the TNC architecture.
-
- The development was started within the bachelor
- thesis of Tobias Ruhe at Hochschule Hannover (University of
- Applied Sciences and Arts Hannover). irongui is now maintained
- and extended within the ESUKOM research project. More information
- can be found at the Trust@FHH website.
- %%
- Copyright (C) 2010 - 2013 Trust@FHH
- %%
- 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.
- #L%
--->
-
-====================================================
-  _____                _     ____  _____ _   _ _   _
- |_   _|_ __ _   _ ___| |_  / __ \|  ___| | | | | | |
-   | | | '__| | | / __| __|/ / _` | |_  | |_| | |_| |
-   | | | |  | |_| \__ \ |_| | (_| |  _| |  _  |  _  |
-   |_| |_|   \__,_|___/\__|\ \__,_|_|   |_| |_|_| |_|
+=====================================================
+  _____                _     ____  _   _       _   _
+ |_   _|_ __ _   _ ___| |_  / __ \| | | | ___ | | | |
+   | | | '__| | | / __| __|/ / _` | |_| |/ __|| |_| |
+   | | | |  | |_| \__ \ |_| | (_| |  _  |\__ \|  _  |
+   |_| |_|   \__,_|___/\__|\ \__,_|_| |_||___/|_| |_|
                             \____/
 
 =====================================================
 
-Hochschule Hannover 
+Hochschule Hannover
 (University of Applied Sciences and Arts, Hannover)
 Faculty IV, Dept. of Computer Science
 Ricklinger Stadtweg 118, 30459 Hannover, Germany
 
 Email: [email protected]
-Website: http://trust.inform.fh-hannover.de/
+Website: http://trust.f4.hs-hannover.de/
 
-This file is part of irongui, version ${project.version}, implemented by the Trust@FHH 
+This file is part of irongui, version ${project.version}, implemented by the Trust@HsH
 research group at the Hochschule Hannover, a program to visualize the content
 of a MAP Server (MAPS), a crucial component within the TNC architecture.
 
 The development was started within the bachelor
 thesis of Tobias Ruhe at Hochschule Hannover (University of
 Applied Sciences and Arts Hannover). irongui is now maintained
 and extended within the ESUKOM research project. More information
-can be found at the Trust@FHH website.
+can be found at the Trust@HsH website.
 
 <#if addSvnKeyWords>
 <#--Add svn Keywords-->
 ${"|Id:|"?replace("|", "$")}
-${"|HeadURL:|"?replace("|", "$")}</#if>
+${"|HeadURL:|"?replace("|", "$")}</#if>