Refactoring

Kieker.WebGUI/nb-configuration.xml

@@ -21,10 +21,10 @@ Any value defined here will override the pom.xml file value but is only applicab
     </properties>
     <spring-data xmlns="http://www.netbeans.org/ns/spring-data/1">
         <config-files>
-            <config-file>src/main/webapp/WEB-INF/spring-config.xml</config-file>
-            <config-file>src/main/webapp/WEB-INF/spring-security-taglib.xml</config-file>
-            <config-file>src/main/webapp/WEB-INF/spring-database-config.xml</config-file>
             <config-file>src/main/webapp/WEB-INF/spring-bean-config.xml</config-file>
+            <config-file>src/main/webapp/WEB-INF/spring-common-config.xml</config-file>
+            <config-file>src/main/webapp/WEB-INF/spring-database-config.xml</config-file>
+            <config-file>src/main/webapp/WEB-INF/spring-security-config.xml</config-file>
         </config-files>
         <config-file-groups/>
     </spring-data>

Kieker.WebGUI/src/main/java/kieker/webgui/common/IUserManager.java

-/***************************************************************************
- * Copyright 2012 Kieker Project (http://kieker-monitoring.net)
- *
- * 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 kieker.webgui.common;
-
-import java.util.List;
-
-import org.springframework.security.access.prepost.PreAuthorize;
-
-import kieker.webgui.domain.User;
-import kieker.webgui.domain.User.Role;
-
-public interface IUserManager {
-
-	@PreAuthorize("hasRole('ROLE_ADMIN')")
-	public void addUser(final String username, final String password, final List<Role> roles);
-
-	@PreAuthorize("hasRole('ROLE_ADMIN')")
-	public void removeUser(final String username);
-
-	@PreAuthorize("hasRole('ROLE_ADMIN')")
-	public void editUser(final String username, final String password, final Role... roles);
-
-	@PreAuthorize("hasRole('ROLE_ADMIN')")
-	public List<User> getUsers();
-
-}

Kieker.WebGUI/src/main/java/kieker/webgui/common/converter/package-info.java

-/***************************************************************************
- * Copyright 2012 Kieker Project (http://kieker-monitoring.net)
- *
- * 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.
- ***************************************************************************/
-
-/**
- * @author Nils Christian Ehmke
- *
- */
-package kieker.webgui.common.converter;
\ No newline at end of file

Kieker.WebGUI/src/main/java/kieker/webgui/common/impl/UserManagerImpl.java

-/***************************************************************************
- * Copyright 2012 Kieker Project (http://kieker-monitoring.net)
- *
- * 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 kieker.webgui.common.impl;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.sql.DataSource;
-
-import org.springframework.security.access.prepost.PreAuthorize;
-
-import kieker.common.logging.Log;
-import kieker.common.logging.LogFactory;
-import kieker.webgui.common.IUserManager;
-import kieker.webgui.domain.User;
-import kieker.webgui.domain.User.Role;
-
-public class UserManagerImpl implements IUserManager {
-
-	private static final Log LOG = LogFactory.getLog(UserManagerImpl.class);
-	private DataSource dataSource;
-	private Connection connection;
-
-	/**
-	 * Default constructor. <b>Do not use this constructor. This bean is Spring managed.</b>
-	 */
-	public UserManagerImpl() {
-		// No code necessary
-	}
-
-	/**
-	 * This method initializes the object.. <b>Do not call this method manually. It will only be accessed by Spring.</b>
-	 */
-	public void initialize() {
-		try {
-			this.connection = this.dataSource.getConnection();
-		} catch (final SQLException ex) {
-			UserManagerImpl.LOG.error("Could not establish database connection.", ex);
-		}
-	}
-
-	public void destroy() {
-		try {
-			this.connection.close();
-		} catch (final SQLException ex) {
-			UserManagerImpl.LOG.error("Could not close database connection.", ex);
-		}
-	}
-
-	public void setDataSource(final DataSource dataSource) {
-		this.dataSource = dataSource;
-	}
-
-	@Override
-	@PreAuthorize("hasRole('ROLE_ADMIN')")
-	public void addUser(final String username, final String password, final List<Role> roles) {
-		PreparedStatement userCmd = null;
-		PreparedStatement roleCmd = null;
-		try {
-			userCmd = this.connection.prepareStatement("INSERT INTO KIEKERUser (name, password, enabled) VALUES (?, ?, True)");
-			roleCmd = this.connection.prepareStatement("INSERT INTO Userroles (name, role) VALUES (?, ?)");
-
-			userCmd.setString(1, username);
-			userCmd.setString(2, password);
-			userCmd.execute();
-
-			roleCmd.setString(1, username);
-			for (final Role role : roles) {
-				roleCmd.setInt(2, role.getID());
-				roleCmd.execute();
-			}
-		} catch (final SQLException ex) {
-			UserManagerImpl.LOG.error("Could not add user to the database.", ex);
-		} finally {
-			if (userCmd != null) {
-				try {
-					userCmd.close();
-				} catch (final SQLException ex) {
-					UserManagerImpl.LOG.error("Could not close prepared statement.", ex);
-				}
-			}
-			if (roleCmd != null) {
-				try {
-					roleCmd.close();
-				} catch (final SQLException ex) {
-					UserManagerImpl.LOG.error("Could not close prepared statement.", ex);
-				}
-			}
-		}
-	}
-
-	@Override
-	@PreAuthorize("hasRole('ROLE_ADMIN')")
-	public void removeUser(final String username) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	@PreAuthorize("hasRole('ROLE_ADMIN')")
-	public void editUser(final String username, final String password, final Role... roles) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	@PreAuthorize("hasRole('ROLE_ADMIN')")
-	public List<User> getUsers() {
-		// FIXME Users without roles
-		final List<User> result = new ArrayList<User>();
-		ResultSet queryResult = null;
-
-		try {
-			final Map<String, User> tempMap = new TreeMap<String, User>();
-
-			final PreparedStatement getQuery = this.connection
-					.prepareStatement("select u.name, ur.role, u.enabled from KIEKERUser u, Userroles ur where u.name=ur.name");
-
-			// Run through all results
-			queryResult = getQuery.executeQuery();
-			while (queryResult.next()) {
-				// Get both the username and the role from the current entry
-				final String username = queryResult.getString(1);
-				final int roleID = queryResult.getInt(2);
-				final Role role = Role.fromID(roleID);
-				final boolean enabled = queryResult.getBoolean(3);
-
-				// If the user doesn't exist in our map yet, add him.
-				// In each case we add the role to the user
-				if (tempMap.containsKey(username)) {
-					tempMap.get(username).getRoles().add(role);
-				} else {
-					final List<Role> roles = new ArrayList<Role>();
-					roles.add(role);
-					tempMap.put(username, new User(username, null, roles, enabled));
-				}
-			}
-
-			// Now convert the map to the list
-			result.addAll(tempMap.values());
-		} catch (final SQLException ex) {
-			UserManagerImpl.LOG.error("Could not receive user list.", ex);
-		} finally {
-			try {
-				if (queryResult != null) {
-					queryResult.close();
-				}
-			} catch (final SQLException ex) {
-				UserManagerImpl.LOG.error("Could not close query result.", ex);
-			}
-		}
-
-		return result;
-	}
-}

Kieker.WebGUI/src/main/java/kieker/webgui/domain/Project.java

@@ -22,6 +22,8 @@ import kieker.analysis.model.analysisMetaModel.MIProject;
  */
 public class Project {
 
+	private String owner;
+	private String lastEditor;
 	private MIProject projectInstance;
 
 	public Project(final MIProject projectInstace) {
@@ -47,4 +49,42 @@ public class Project {
 		this.projectInstance = projectInstance;
 	}
 
+	/**
+	 * Getter for the property {@link Project#owner}.
+	 * 
+	 * @return The current value of the property.
+	 */
+	public String getOwner() {
+		return this.owner;
+	}
+
+	/**
+	 * Setter for the property {@link Project#owner}.
+	 * 
+	 * @param owner
+	 *            The new value of the property.
+	 */
+	public void setOwner(final String owner) {
+		this.owner = owner;
+	}
+
+	/**
+	 * Getter for the property {@link Project#lastEditor}.
+	 * 
+	 * @return The current value of the property.
+	 */
+	public String getLastEditor() {
+		return this.lastEditor;
+	}
+
+	/**
+	 * Setter for the property {@link Project#lastEditor}.
+	 * 
+	 * @param lastEditor
+	 *            The new value of the property.
+	 */
+	public void setLastEditor(final String lastEditor) {
+		this.lastEditor = lastEditor;
+	}
+
 }

Kieker.WebGUI/src/main/java/kieker/webgui/persistence/IUserDAO.java

@@ -22,7 +22,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 
 import kieker.webgui.domain.User;
-import kieker.webgui.common.exception.DataAccessException;
+import kieker.webgui.domain.User.Role;
 
 /**
  * 
@@ -33,18 +33,18 @@ public interface IUserDAO {
 
 	@PreAuthorize("hasRole('ROLE_ADMIN')")
 	@Transactional
-	public void addUser(final User user) throws DataAccessException;
+	public void addUser(final String username, final String password, final List<Role> roles);
 
 	@PreAuthorize("hasRole('ROLE_ADMIN')")
 	@Transactional
-	public void editUser(final User user) throws DataAccessException;
+	public void removeUser(final String username);
 
 	@PreAuthorize("hasRole('ROLE_ADMIN')")
 	@Transactional
-	public void deleteUser(final User user) throws DataAccessException;
+	public void editUser(final String username, final String password, final Role... roles);
 
 	@PreAuthorize("hasRole('ROLE_ADMIN')")
 	@Transactional
-	public List<User> getUsers() throws DataAccessException;
+	public List<User> getUsers();
 
 }

Kieker.WebGUI/src/main/java/kieker/webgui/persistence/impl/DerbyUserDAOImpl.java

@@ -31,7 +31,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 
 import kieker.common.logging.Log;
 import kieker.common.logging.LogFactory;
-import kieker.webgui.common.exception.DataAccessException;
 import kieker.webgui.domain.User;
 import kieker.webgui.domain.User.Role;
 import kieker.webgui.persistence.IUserDAO;
@@ -46,51 +45,61 @@ public class DerbyUserDAOImpl implements IUserDAO {
 	private DataSource dataSource;
 	private Connection connection;
 
-	public void initialize() throws Exception {
-		this.connection = this.dataSource.getConnection();
-	}
-
-	public void destroy() throws Exception {
-		this.connection.close();
+	/**
+	 * Default constructor. <b>Do not use this constructor. This bean is Spring managed.</b>
+	 */
+	public DerbyUserDAOImpl() {
+		// No code necessary
 	}
 
 	/**
-	 * Setter for the property {@link DerbyUserDAO#dataSource}.
-	 * 
-	 * @param dataSource
-	 *            The new value of the property.
+	 * This method initializes the object.. <b>Do not call this method manually. It will only be accessed by Spring.</b>
 	 */
+	public void initialize() {
+		try {
+			this.connection = this.dataSource.getConnection();
+		} catch (final SQLException ex) {
+			DerbyUserDAOImpl.LOG.error("Could not establish database connection.", ex);
+		}
+	}
+
+	public void destroy() {
+		try {
+			this.connection.close();
+		} catch (final SQLException ex) {
+			DerbyUserDAOImpl.LOG.error("Could not close database connection.", ex);
+		}
+	}
+
 	public void setDataSource(final DataSource dataSource) {
 		this.dataSource = dataSource;
 	}
 
 	@Override
 	@PreAuthorize("hasRole('ROLE_ADMIN')")
-	public void addUser(final User user) throws DataAccessException {
+	public void addUser(final String username, final String password, final List<Role> roles) {
 		PreparedStatement userCmd = null;
 		PreparedStatement roleCmd = null;
 		try {
-			userCmd = this.connection.prepareStatement("INSERT INTO KIEKERUser (name, password, enabled) VALUES (?, ?, ?)");
+			userCmd = this.connection.prepareStatement("INSERT INTO KIEKERUser (name, password, enabled) VALUES (?, ?, True)");
 			roleCmd = this.connection.prepareStatement("INSERT INTO Userroles (name, role) VALUES (?, ?)");
 
-			userCmd.setString(1, user.getName());
-			userCmd.setString(2, user.getPassword());
-			userCmd.setBoolean(3, user.isEnabled());
+			userCmd.setString(1, username);
+			userCmd.setString(2, password);
 			userCmd.execute();
 
-			roleCmd.setString(1, user.getName());
-			for (final Role role : user.getRoles()) {
+			roleCmd.setString(1, username);
+			for (final Role role : roles) {
 				roleCmd.setInt(2, role.getID());
 				roleCmd.execute();
 			}
 		} catch (final SQLException ex) {
-			throw new DataAccessException("Could not add user to the database.", ex);
+			DerbyUserDAOImpl.LOG.error("Could not add user to the database.", ex);
 		} finally {
 			if (userCmd != null) {
 				try {
 					userCmd.close();
 				} catch (final SQLException ex) {
-					// No need to inform the calling method
 					DerbyUserDAOImpl.LOG.error("Could not close prepared statement.", ex);
 				}
 			}
@@ -98,7 +107,6 @@ public class DerbyUserDAOImpl implements IUserDAO {
 				try {
 					roleCmd.close();
 				} catch (final SQLException ex) {
-					// No need to inform the calling method
 					DerbyUserDAOImpl.LOG.error("Could not close prepared statement.", ex);
 				}
 			}
@@ -107,19 +115,20 @@ public class DerbyUserDAOImpl implements IUserDAO {
 
 	@Override
 	@PreAuthorize("hasRole('ROLE_ADMIN')")
-	public void deleteUser(final User user) throws DataAccessException {
+	public void removeUser(final String username) {
 		// TODO Auto-generated method stub
+
 	}
 
 	@Override
 	@PreAuthorize("hasRole('ROLE_ADMIN')")
-	public void editUser(final User user) throws DataAccessException {
+	public void editUser(final String username, final String password, final Role... roles) {
 		// TODO Auto-generated method stub
 	}
 
 	@Override
 	@PreAuthorize("hasRole('ROLE_ADMIN')")
-	public List<User> getUsers() throws DataAccessException {
+	public List<User> getUsers() {
 		// FIXME Users without roles
 		final List<User> result = new ArrayList<User>();
 		ResultSet queryResult = null;
@@ -153,14 +162,13 @@ public class DerbyUserDAOImpl implements IUserDAO {
 			// Now convert the map to the list
 			result.addAll(tempMap.values());
 		} catch (final SQLException ex) {
-			throw new DataAccessException("Could not receive user list.", ex);
+			DerbyUserDAOImpl.LOG.error("Could not receive user list.", ex);
 		} finally {
 			try {
 				if (queryResult != null) {
 					queryResult.close();
 				}
 			} catch (final SQLException ex) {
-				// No need to inform the calling method
 				DerbyUserDAOImpl.LOG.error("Could not close query result.", ex);
 			}
 		}

Kieker.WebGUI/src/main/java/kieker/webgui/service/IUserService.java

@@ -15,9 +15,33 @@
  ***************************************************************************/
 package kieker.webgui.service;
 
+import java.util.List;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+
+import kieker.webgui.domain.User;
+import kieker.webgui.domain.User.Role;
+
 /**
  * @author Nils Christian Ehmke
  */
 public interface IUserService {
 
+	@PreAuthorize("hasRole('ROLE_ADMIN')")
+	@Transactional
+	public void addUser(final String username, final String password, final List<Role> roles);
+
+	@PreAuthorize("hasRole('ROLE_ADMIN')")
+	@Transactional
+	public void removeUser(final String username);
+
+	@PreAuthorize("hasRole('ROLE_ADMIN')")
+	@Transactional
+	public void editUser(final String username, final String password, final Role... roles);
+
+	@PreAuthorize("hasRole('ROLE_ADMIN')")
+	@Transactional
+	public List<User> getUsers();
+
 }

Kieker.WebGUI/src/main/java/kieker/webgui/service/impl/UserServiceImpl.java

@@ -15,6 +15,14 @@
  ***************************************************************************/
 package kieker.webgui.service.impl;
 
+import java.util.List;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+
+import kieker.webgui.domain.User;
+import kieker.webgui.domain.User.Role;
+import kieker.webgui.persistence.IUserDAO;
 import kieker.webgui.service.IUserService;
 
 /**
@@ -22,11 +30,68 @@ import kieker.webgui.service.IUserService;
  */
 public class UserServiceImpl implements IUserService {
 
+	private IUserDAO userDAO;
+
+	public UserServiceImpl() {
+		// No code necessary
+	}
+
 	/**
+	 * Setter for the property {@link UserServiceImpl#userDAO}.
 	 * 
+	 * @param userDAO
+	 *            The new value of the property.
 	 */
-	public UserServiceImpl() {
-		// TODO Auto-generated constructor stub
+	public void setUserDAO(final IUserDAO userDAO) {
+		this.userDAO = userDAO;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see kieker.webgui.service.IUserService#addUser(java.lang.String, java.lang.String, java.util.List)
+	 */
+	@Override
+	@PreAuthorize("hasRole('ROLE_ADMIN')")
+	@Transactional
+	public void addUser(final String username, final String password, final List<Role> roles) {
+		this.userDAO.addUser(username, password, roles);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see kieker.webgui.service.IUserService#removeUser(java.lang.String)
+	 */
+	@Override
+	@PreAuthorize("hasRole('ROLE_ADMIN')")
+	@Transactional
+	public void removeUser(final String username) {
+		this.userDAO.removeUser(username);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see kieker.webgui.service.IUserService#editUser(java.lang.String, java.lang.String, kieker.webgui.domain.User.Role[])
+	 */
+	@Override
+	@PreAuthorize("hasRole('ROLE_ADMIN')")
+	@Transactional
+	public void editUser(final String username, final String password, final Role... roles) {
+		this.userDAO.editUser(username, password, roles);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see kieker.webgui.service.IUserService#getUsers()
+	 */
+	@Override
+	@PreAuthorize("hasRole('ROLE_ADMIN')")
+	@Transactional
+	public List<User> getUsers() {
+		return this.userDAO.getUsers();
 	}
 
 }

Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/GlobalPropertiesBean.java → Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/application/GlobalPropertiesBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-package kieker.webgui.beans.application;
+package kieker.webgui.web.beans.application;
 
 import java.io.Serializable;
 import java.util.ResourceBundle;

Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ProjectsBean.java → Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/application/ProjectsBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-package kieker.webgui.beans.application;
+package kieker.webgui.web.beans.application;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -27,7 +27,7 @@ import javax.faces.application.FacesMessage;
 import kieker.analysis.model.analysisMetaModel.MIProject;
 import kieker.common.logging.Log;
 import kieker.common.logging.LogFactory;
-import kieker.webgui.beans.view.CurrentProjectOverviewBean;
+import kieker.webgui.web.beans.view.CurrentProjectOverviewBean;
 import kieker.webgui.common.exception.ProjectAlreadyExistingException;
 import kieker.webgui.common.exception.ProjectLoadException;
 import kieker.webgui.common.exception.ProjectNotExistingException;

Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ThemeSwitcherBean.java → Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/application/ThemeSwitcherBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-package kieker.webgui.beans.application;
+package kieker.webgui.web.beans.application;
 
 import java.util.Collections;
 import java.util.Map;

Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/package-info.java → Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/application/package-info.java

@@ -19,5 +19,5 @@
  * 
  * @author Nils Christian Ehmke
  */
-package kieker.webgui.beans.application;
+package kieker.webgui.web.beans.application;
 

Kieker.WebGUI/src/main/java/kieker/webgui/beans/request/NewUserBean.java → Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/request/NewUserBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-package kieker.webgui.beans.request;
+package kieker.webgui.web.beans.request;
 
 import java.util.ArrayList;
 import java.util.List;

Kieker.WebGUI/src/main/java/kieker/webgui/beans/request/StringBean.java → Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/request/StringBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-package kieker.webgui.beans.request;
+package kieker.webgui.web.beans.request;
 
 /**
  * This simple bean can be used to store a string during a request. Furthermore it provides some simple methods to handle strings within the application where a bean

Kieker.WebGUI/src/main/java/kieker/webgui/beans/request/package-info.java → Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/request/package-info.java

@@ -19,5 +19,5 @@
  * 
  * @author Nils Christian Ehmke
  */
-package kieker.webgui.beans.request;
+package kieker.webgui.web.beans.request;
 

Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java → Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/session/UserBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-package kieker.webgui.beans.session;
+package kieker.webgui.web.beans.session;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 
-import kieker.webgui.beans.application.GlobalPropertiesBean;
+import kieker.webgui.web.beans.application.GlobalPropertiesBean;
 
 /**
  * This bean contains information about the user of this session (like the properties and configurations). This class is a Spring managed bean with session scope.

Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/package-info.java → Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/session/package-info.java

@@ -19,5 +19,5 @@
  * 
  * @author Nils Christian Ehmke
  */
-package kieker.webgui.beans.session;
+package kieker.webgui.web.beans.session;
 

Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorBean.java → Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentAnalysisEditorBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-package kieker.webgui.beans.view;
+package kieker.webgui.web.beans.view;
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
@@ -49,9 +49,9 @@ import kieker.analysis.plugin.reader.AbstractReaderPlugin;
 import kieker.analysis.repository.AbstractRepository;
 import kieker.common.logging.Log;
 import kieker.common.logging.LogFactory;
-import kieker.webgui.beans.application.GlobalPropertiesBean;
-import kieker.webgui.beans.application.ProjectsBean;
-import kieker.webgui.beans.session.UserBean;
+import kieker.webgui.web.beans.application.GlobalPropertiesBean;
+import kieker.webgui.web.beans.application.ProjectsBean;
+import kieker.webgui.web.beans.session.UserBean;
 import kieker.webgui.common.ClassAndMethodContainer;
 import kieker.webgui.common.exception.LibraryAlreadyExistingException;
 import kieker.webgui.common.exception.LibraryLoadException;

Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorGraphBean.java → Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentAnalysisEditorGraphBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-package kieker.webgui.beans.view;
+package kieker.webgui.web.beans.view;
 
 import java.util.Map;