diff --git a/src/java/net/brutex/xservices/security/Identity.java b/src/java/net/brutex/xservices/security/Identity.java
new file mode 100644
index 0000000..65a2028
--- /dev/null
+++ b/src/java/net/brutex/xservices/security/Identity.java
@@ -0,0 +1,43 @@
+<<<<<<< .mine
+package net.brutex.xservices.security;
+
+import java.util.UUID;
+
+public abstract interface Identity
+{
+  public abstract UUID getUUID();
+}
+
+/* Location:           C:\Users\brosenberger\Documents\My Box Files\XBridgeNG-download\XServices-20130131 - Kopie\WEB-INF\classes\net.zip
+ * Qualified Name:     net.brutex.xservices.security.Identity
+ * JD-Core Version:    0.6.2
+ */=======
+/*
+ *   Copyright 2012 Brian Rosenberger (Brutex Network)
+ *
+ *   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 net.brutex.xservices.security;
+
+import java.util.UUID;
+
+
+
+public interface Identity {
+
+	public UUID getUUID();
+	
+	
+}
+>>>>>>> .r97
diff --git a/src/java/net/brutex/xservices/security/SecurityManager.java b/src/java/net/brutex/xservices/security/SecurityManager.java
new file mode 100644
index 0000000..2dd9f57
--- /dev/null
+++ b/src/java/net/brutex/xservices/security/SecurityManager.java
@@ -0,0 +1,11 @@
+package net.brutex.xservices.security;
+
+public abstract interface SecurityManager
+{
+  public abstract boolean canExecute(String paramString, Identity paramIdentity);
+}
+
+/* Location:           C:\Users\brosenberger\Documents\My Box Files\XBridgeNG-download\XServices-20130131 - Kopie\WEB-INF\classes\net.zip
+ * Qualified Name:     net.brutex.xservices.security.SecurityManager
+ * JD-Core Version:    0.6.2
+ */
\ No newline at end of file
diff --git a/src/java/net/brutex/xservices/security/StandardSecurityManager.java b/src/java/net/brutex/xservices/security/StandardSecurityManager.java
new file mode 100644
index 0000000..098d862
--- /dev/null
+++ b/src/java/net/brutex/xservices/security/StandardSecurityManager.java
@@ -0,0 +1,18 @@
+/*    */ package net.brutex.xservices.security;
+/*    */ 
+/*    */ import java.io.PrintStream;
+/*    */ 
+/*    */ public class StandardSecurityManager
+/*    */   implements SecurityManager
+/*    */ {
+/*    */   public boolean canExecute(String method, Identity identity)
+/*    */   {
+/*  9 */     System.out.println("User '" + identity.getUUID() + "' accesses '" + method + "'");
+/* 10 */     return true;
+/*    */   }
+/*    */ }
+
+/* Location:           C:\Users\brosenberger\Documents\My Box Files\XBridgeNG-download\XServices-20130131 - Kopie\WEB-INF\classes\net.zip
+ * Qualified Name:     net.brutex.xservices.security.StandardSecurityManager
+ * JD-Core Version:    0.6.2
+ */
\ No newline at end of file
diff --git a/src/java/net/brutex/xservices/security/UserIdentity.java b/src/java/net/brutex/xservices/security/UserIdentity.java
new file mode 100644
index 0000000..6392bb1
--- /dev/null
+++ b/src/java/net/brutex/xservices/security/UserIdentity.java
@@ -0,0 +1,17 @@
+/*   */ package net.brutex.xservices.security;
+/*   */ 
+/*   */ import java.util.UUID;
+/*   */ 
+/*   */ public class UserIdentity
+/*   */   implements Identity
+/*   */ {
+/*   */   public UUID getUUID()
+/*   */   {
+/* 9 */     return UUID.randomUUID();
+/*   */   }
+/*   */ }
+
+/* Location:           C:\Users\brosenberger\Documents\My Box Files\XBridgeNG-download\XServices-20130131 - Kopie\WEB-INF\classes\net.zip
+ * Qualified Name:     net.brutex.xservices.security.UserIdentity
+ * JD-Core Version:    0.6.2
+ */
\ No newline at end of file