From 1d99a6c0cbd69cb78327efb0c2961a355150ee14 Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Sat, 27 Oct 2012 17:26:49 +0200
Subject: [PATCH] Removed some unnecessary code; Corrected some path bugs; Made
sure that javadoc will be included within the source archive
---
.../config/descriptors/descriptor-src.xml | 11 ++++++++---
Kieker.WebGUI/pom.xml | 14 +++++++++++++-
.../beans/application/GlobalPropertiesBean.java | 10 ----------
.../webgui/beans/application/ProjectsBean.java | 3 ---
.../beans/session/CurrentConfigurationBean.java | 3 ---
.../java/kieker/webgui/beans/session/UserBean.java | 2 --
.../beans/view/CurrentAnalysisEditorBean.java | 11 -----------
.../webgui/beans/view/CurrentCockpitBean.java | 5 -----
.../beans/view/CurrentCockpitEditorBean.java | 6 ------
.../webgui/beans/view/CurrentControllerBean.java | 5 -----
.../beans/view/CurrentProjectOverviewBean.java | 3 ---
.../beans/view/CurrentUserManagementBean.java | 3 ---
.../common/impl/ProjectManagerFacadeImpl.java | 5 -----
.../webgui/common/impl/UserManagerFacadeImpl.java | 2 --
.../src/main/webapp/pages/AnalysisEditorPage.xhtml | 8 ++++----
.../src/main/webapp/pages/CockpitPage.xhtml | 2 +-
.../main/webapp/pages/ProjectOverviewPage.xhtml | 2 +-
.../webapp/pages/admin/UserManagementPage.xhtml | 2 +-
18 files changed, 28 insertions(+), 69 deletions(-)
diff --git a/Kieker.WebGUI/config/descriptors/descriptor-src.xml b/Kieker.WebGUI/config/descriptors/descriptor-src.xml
index 761bdc0d..d4ff7be0 100644
--- a/Kieker.WebGUI/config/descriptors/descriptor-src.xml
+++ b/Kieker.WebGUI/config/descriptors/descriptor-src.xml
@@ -1,6 +1,7 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>src</id>
<formats>
<format>tar.gz</format>
@@ -16,5 +17,9 @@
<exclude>**/${project.build.directory}/**</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/site/apidocs</directory>
+ <outputDirectory>/doc</outputDirectory>
+ </fileSet>
</fileSets>
</assembly>
\ No newline at end of file
diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml
index e68268b9..40fc5579 100644
--- a/Kieker.WebGUI/pom.xml
+++ b/Kieker.WebGUI/pom.xml
@@ -69,7 +69,7 @@
<artifactId>spring-security-taglibs</artifactId>
<version>${spring.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.springframework.webflow</groupId>
<artifactId>spring-faces</artifactId>
<version>2.3.1.RELEASE</version>
@@ -418,6 +418,18 @@
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/GlobalPropertiesBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/GlobalPropertiesBean.java
index f5e4514e..d93a1bdc 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/GlobalPropertiesBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/GlobalPropertiesBean.java
@@ -23,8 +23,6 @@ import javax.faces.application.FacesMessage;
import javax.faces.application.FacesMessage.Severity;
import javax.faces.context.FacesContext;
-import org.springframework.beans.factory.annotation.Autowired;
-
/**
* The class {@link GlobalPropertiesBean} is a singleton scoped Spring bean, containing properties, constants and partially localized texts for the application. Some
* of the properties are injected via Spring, others are loaded directly from the resource bundle. This makes sure that those constants can be modified without a
@@ -52,21 +50,13 @@ public final class GlobalPropertiesBean implements Serializable {
private static final String PROPERTY_MSG_LIBRARY_EXISTING_EXCEPTION = "msgLibraryExistingException";
private static final String PROPERTY_MSG_LIBRARY_UPLOADING_EXCEPTION = "msgLibraryUploadingException";
- @Autowired
private String themeCookieName;
- @Autowired
private String projectOverviewPage;
- @Autowired
private String facesContextThemeKey;
- @Autowired
private String defaultTheme;
- @Autowired
private String analysisEditorGridSizeCookieName;
- @Autowired
private String analysisEditorGridColorCookieName;
- @Autowired
private String analysisEditorDefaultGridSize;
- @Autowired
private String analysisEditorDefaultGridColor;
/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ProjectsBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ProjectsBean.java
index 716c6d8e..ddcc1b67 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ProjectsBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ProjectsBean.java
@@ -24,8 +24,6 @@ import java.util.List;
import javax.faces.application.FacesMessage;
-import org.springframework.beans.factory.annotation.Autowired;
-
import kieker.analysis.model.analysisMetaModel.MIProject;
import kieker.common.logging.Log;
import kieker.common.logging.LogFactory;
@@ -52,7 +50,6 @@ public final class ProjectsBean {
private final List<String> projects = Collections.synchronizedList(new ArrayList<String>());
- @Autowired
private IProjectManagerFacade projectManagerFacade;
/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentConfigurationBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentConfigurationBean.java
index 97909647..af849079 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentConfigurationBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentConfigurationBean.java
@@ -23,8 +23,6 @@ import javax.faces.context.FacesContext;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-
import kieker.webgui.beans.application.GlobalPropertiesBean;
/**
@@ -41,7 +39,6 @@ public final class CurrentConfigurationBean implements Serializable {
private String gridColor;
private int gridSize;
- @Autowired
private GlobalPropertiesBean globalPropertiesBean;
/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
index c5d61c95..312ba73e 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
@@ -18,7 +18,6 @@ package kieker.webgui.beans.session;
import java.io.Serializable;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
@@ -35,7 +34,6 @@ public final class UserBean implements Serializable {
private static final long serialVersionUID = 6422563876003638348L;
- @Autowired
private GlobalPropertiesBean globalPropertiesBean;
/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorBean.java
index a228a20e..4889d823 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorBean.java
@@ -29,8 +29,6 @@ import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
import javax.faces.event.ValueChangeEvent;
-import org.springframework.beans.factory.annotation.Autowired;
-
import kieker.analysis.model.analysisMetaModel.MIAnalysisMetaModelFactory;
import kieker.analysis.model.analysisMetaModel.MIDependency;
import kieker.analysis.model.analysisMetaModel.MIDisplay;
@@ -134,19 +132,10 @@ public final class CurrentAnalysisEditorBean {
* This field contains the currently selected component (this can either be a plugin ({@link MIPlugin}) or a repository ({@link MIRepository})).
*/
private EObject selectedComponent;
- @Autowired
private IProjectManagerFacade projectManagerFacade;
-
- @Autowired
private ProjectsBean projectsBean;
-
- @Autowired
private CurrentAnalysisEditorGraphBean currentAnalysisEditorGraphBean;
-
- @Autowired
private CurrentConfigurationBean currentConfigurationBean;
-
- @Autowired
private GlobalPropertiesBean globalPropertiesBean;
/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
index 63f68c4b..6ae27637 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
@@ -21,8 +21,6 @@ import java.io.IOException;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
-import org.springframework.beans.factory.annotation.Autowired;
-
import kieker.analysis.model.analysisMetaModel.MIProject;
import kieker.analysis.model.analysisMetaModel.MIView;
import kieker.common.logging.Log;
@@ -45,14 +43,11 @@ import kieker.webgui.common.exception.ProjectNotExistingException;
public final class CurrentCockpitBean {
private static final Log LOG = LogFactory.getLog(CurrentCockpitBean.class);
- @Autowired
private IProjectManagerFacade projectManagerFacade;
private String projectName;
private MIProject project;
private MIView activeView;
private ClassAndMethodContainer classAndMethodContainer;
-
- @Autowired
private ProjectsBean projectsBean;
/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitEditorBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitEditorBean.java
index 41252700..19c278ae 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitEditorBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitEditorBean.java
@@ -30,8 +30,6 @@ import javax.faces.component.UIInput;
import javax.faces.component.html.HtmlOutputText;
import javax.faces.context.FacesContext;
-import org.springframework.beans.factory.annotation.Autowired;
-
import kieker.analysis.display.annotation.Display;
import kieker.analysis.model.analysisMetaModel.MIAnalysisMetaModelFactory;
import kieker.analysis.model.analysisMetaModel.MIDisplay;
@@ -72,7 +70,6 @@ public final class CurrentCockpitEditorBean {
private static final Log LOG = LogFactory.getLog(CurrentCockpitEditorBean.class);
private final MIAnalysisMetaModelFactory factory = new MAnalysisMetaModelFactory();
- @Autowired
private IProjectManagerFacade projectManagerFacade;
private ClassAndMethodContainer classAndMethodContainer;
@@ -84,10 +81,7 @@ public final class CurrentCockpitEditorBean {
private Dashboard dashboard;
private DashboardModel dashboardModel;
- @Autowired
private ProjectsBean projectsBean;
-
- @Autowired
private GlobalPropertiesBean globalPropertiesBean;
/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java
index 85610df8..6c19fc30 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java
@@ -25,8 +25,6 @@ import java.util.Collection;
import java.util.Date;
import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-
import kieker.analysis.AnalysisController;
import kieker.common.logging.Log;
import kieker.common.logging.LogFactory;
@@ -47,12 +45,9 @@ public final class CurrentControllerBean {
private static final Log LOG = LogFactory.getLog(CurrentControllerBean.class);
- @Autowired
private IProjectManagerFacade projectManagerFacade;
private final List<String> logEntries = new ArrayList<String>();
private String projectName;
-
- @Autowired
private ProjectsBean projectsBean;
/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentProjectOverviewBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentProjectOverviewBean.java
index 81fbe74b..6ccfb249 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentProjectOverviewBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentProjectOverviewBean.java
@@ -19,8 +19,6 @@ package kieker.webgui.beans.view;
import java.util.ArrayList;
import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-
import kieker.webgui.beans.application.ProjectsBean;
import org.primefaces.event.SelectEvent;
@@ -33,7 +31,6 @@ import org.primefaces.event.SelectEvent;
*/
public final class CurrentProjectOverviewBean {
- @Autowired
private ProjectsBean projectsBean;
/**
* This list contains all available projects by name.
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentUserManagementBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentUserManagementBean.java
index 6321488c..233bea19 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentUserManagementBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentUserManagementBean.java
@@ -19,8 +19,6 @@ package kieker.webgui.beans.view;
import java.util.ArrayList;
import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-
import kieker.webgui.common.IUserManagerFacade;
import kieker.webgui.common.Role;
import kieker.webgui.common.User;
@@ -30,7 +28,6 @@ import kieker.webgui.common.User;
*/
public final class CurrentUserManagementBean {
- @Autowired
private IUserManagerFacade userManagerFacade;
/**
* This list contains all available users.
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/impl/ProjectManagerFacadeImpl.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/impl/ProjectManagerFacadeImpl.java
index 06a0505c..08248921 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/impl/ProjectManagerFacadeImpl.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/impl/ProjectManagerFacadeImpl.java
@@ -22,8 +22,6 @@ import java.util.Collection;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
-import org.springframework.beans.factory.annotation.Autowired;
-
import kieker.analysis.AnalysisController.STATE;
import kieker.analysis.model.analysisMetaModel.MIDependency;
import kieker.analysis.model.analysisMetaModel.MIProject;
@@ -54,11 +52,8 @@ public final class ProjectManagerFacadeImpl implements IProjectManagerFacade {
private final ConcurrentHashMap<String, Object> fileSystemLocks = new ConcurrentHashMap<String, Object>();
private final ConcurrentHashMap<String, Object> analysesLocks = new ConcurrentHashMap<String, Object>();
- @Autowired
private ACManager acManager;
- @Autowired
private FSManager fsManager;
- @Autowired
private PluginFinder pluginFinder;
/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/impl/UserManagerFacadeImpl.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/impl/UserManagerFacadeImpl.java
index eb7e7e4e..9381ab90 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/impl/UserManagerFacadeImpl.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/impl/UserManagerFacadeImpl.java
@@ -27,7 +27,6 @@ import java.util.TreeMap;
import javax.sql.DataSource;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import kieker.common.logging.Log;
@@ -39,7 +38,6 @@ import kieker.webgui.common.User;
public class UserManagerFacadeImpl implements IUserManagerFacade {
private static final Log LOG = LogFactory.getLog(UserManagerFacadeImpl.class);
- @Autowired
private DataSource dataSource;
private Connection connection;
diff --git a/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml
index b3a44b8c..1f769446 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml
@@ -28,13 +28,13 @@
</ui:define>
<ui:define name="cssIncludes">
- <link rel="stylesheet" type="text/css" href="/css/FlowEditor.css" />
- <link rel="stylesheet" type="text/css" href="/css/AnalysisEditorPage.css" />
+ <link rel="stylesheet" type="text/css" href="#{root}/css/FlowEditor.css" />
+ <link rel="stylesheet" type="text/css" href="#{root}/css/AnalysisEditorPage.css" />
</ui:define>
<ui:define name="jsIncludes">
- <script language="javascript" type="text/javascript" src="/js/jit.js"></script>
- <script language="javascript" type="text/javascript" src="/js/flowEditor.js"></script>
+ <script language="javascript" type="text/javascript" src="#{root}/js/jit.js"></script>
+ <script language="javascript" type="text/javascript" src="#{root}/js/flowEditor.js"></script>
</ui:define>
<ui:define name="js">
diff --git a/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
index a7d8fea5..f54465a4 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
@@ -28,7 +28,7 @@
</ui:define>
<ui:define name="cssIncludes">
- <link rel="stylesheet" type="text/css" href="../css/CockpitPage.css" />
+ <link rel="stylesheet" type="text/css" href="#{root}/css/CockpitPage.css" />
</ui:define>
<!-- Those are the menu bar entries left from the help-submenu. -->
diff --git a/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml
index daca2d98..18e9b18f 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml
@@ -21,7 +21,7 @@
</ui:define>
<ui:define name="cssIncludes">
- <link rel="stylesheet" type="text/css" href="/css/ProjectOverviewPage.css" />
+ <link rel="stylesheet" type="text/css" href="#{root}/css/ProjectOverviewPage.css" />
</ui:define>
<!-- Those are the menu bar entries left from the help-submenu. -->
diff --git a/Kieker.WebGUI/src/main/webapp/pages/admin/UserManagementPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/admin/UserManagementPage.xhtml
index 1ed4f911..b44ced63 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/admin/UserManagementPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/admin/UserManagementPage.xhtml
@@ -20,7 +20,7 @@
</ui:define>
<ui:define name="cssIncludes">
- <link rel="stylesheet" type="text/css" href="/css/UserManagement.css" />
+ <link rel="stylesheet" type="text/css" href="#{root}/css/UserManagement.css" />
</ui:define>
<!-- Those are the menu bar entries left from the help-submenu. -->
--
GitLab