Hurrdurr.. Classpathfiksailua.. Mäkit ei hanskaa 1.7

code/LanBortalDatabase/.classpath

@@ -8,7 +8,7 @@
 			<attribute name="owner.project.facets" value="jst.utility"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>

code/LanBortalDatabase/.settings/org.eclipse.jdt.core.prefs

 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

code/LanBortalDatabase/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -6,5 +6,5 @@
   <fixed facet="jpt.jpa"/>
   <installed facet="jst.utility" version="1.0"/>
   <installed facet="jpt.jpa" version="2.0"/>
-  <installed facet="jst.java" version="1.7"/>
+  <installed facet="jst.java" version="1.6"/>
 </faceted-project>

code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventPropertyKey.java

@@ -6,7 +6,8 @@ public enum LanEventPropertyKey {
     INVITEMAIL_CONTENT(Type.TEXT, "You have been invited to Stream demoparty by {1}.\n\nYou can register to stream demparty intranet at: {0}\n\nAfter registering to the intranet you can buy a ticket to Stream demoparty reduced price and invite your friends to join the party with you. More information can be found in the intranet. Remember also to visit our website at http://www.streamparty.org and join us at #streamparty in IRCNet. If you have any questions about this mail, registering to intranet, or anything else regarding Stream demoparty, please send us email to info@streamparty.org\n\n-- \nStream organizing\ninfo@streamparty.org"),
     PORTAL_EMAIL_ADDRESS(Type.TEXT, "intra@streamparty.org"),
     PORTAL_EMAIL_NAME(Type.TEXT, "Streamparty intranet"),
-    ADMIN_MAIL(Type.TEXT, "intra@streamparty.org"), ;
+    ADMIN_MAIL(Type.TEXT, "intra@streamparty.org"),
+    EVENT_LAYOUT(Type.TEXT, "layout1"), ;
     private enum Type {
         TEXT, DATE, DATA
     };

code/LanBortalWeb/src/fi/insomnia/bortal/HostnameFilter.java

@@ -117,7 +117,6 @@ public class HostnameFilter implements Filter {
 
 		}
 		// pass the request along the filter chain
-		logger.warn("Hurrdurr...");
 		try {
 			chain.doFilter(request, response);
 		} finally {

code/LanBortalWeb/src/fi/insomnia/bortal/handler/SessionHandler.java

@@ -23,6 +23,7 @@ import fi.insomnia.bortal.beans.RoleBeanLocal;
 import fi.insomnia.bortal.clientutils.BortalLocalContextHolder;
 import fi.insomnia.bortal.enums.apps.IAppPermission;
 import fi.insomnia.bortal.model.EventUser;
+import fi.insomnia.bortal.model.LanEventPropertyKey;
 
 /**
  * 
@@ -44,6 +45,8 @@ public class SessionHandler {
 	@EJB
 	private PermissionBeanLocal permbean;
 
+	private String template;
+
 	public TimeZone getTimezone() {
 		return TimeZone.getTimeZone("Europe/Helsinki");
 	}
@@ -62,7 +65,14 @@ public class SessionHandler {
 	public String getLayout() {
 		// TODO: layout selection code missing!!
 		// return "stream1";
-		return "template1";
+		if (template == null)
+		{
+			template = eventbean.getPropertyString(LanEventPropertyKey.EVENT_LAYOUT);
+		}
+		if (template == null) {
+			template = "template1";
+		}
+		return template;
 	}
 
 	// public boolean hasPermission(String target, String permission) {