From hise-commits-return-70-apmail-incubator-hise-commits-archive=incubator.apache.org@incubator.apache.org Wed Feb 24 13:18:59 2010 Return-Path: Delivered-To: apmail-incubator-hise-commits-archive@minotaur.apache.org Received: (qmail 76286 invoked from network); 24 Feb 2010 13:18:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Feb 2010 13:18:59 -0000 Received: (qmail 5491 invoked by uid 500); 24 Feb 2010 13:18:59 -0000 Delivered-To: apmail-incubator-hise-commits-archive@incubator.apache.org Received: (qmail 5471 invoked by uid 500); 24 Feb 2010 13:18:58 -0000 Mailing-List: contact hise-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hise-dev@incubator.apache.org Delivered-To: mailing list hise-commits@incubator.apache.org Received: (qmail 5462 invoked by uid 99); 24 Feb 2010 13:18:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Feb 2010 13:18:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Feb 2010 13:18:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B36A123888CF; Wed, 24 Feb 2010 13:18:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r915778 - in /incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine: DefaultHISEUserDetails.java jaxws/TaskOperationsImpl.java Date: Wed, 24 Feb 2010 13:18:37 -0000 To: hise-commits@incubator.apache.org From: rr@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100224131837.B36A123888CF@eris.apache.org> Author: rr Date: Wed Feb 24 13:18:37 2010 New Revision: 915778 URL: http://svn.apache.org/viewvc?rev=915778&view=rev Log: HISE-25: Authorization update Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/DefaultHISEUserDetails.java incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TaskOperationsImpl.java Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/DefaultHISEUserDetails.java URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/DefaultHISEUserDetails.java?rev=915778&r1=915777&r2=915778&view=diff ============================================================================== --- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/DefaultHISEUserDetails.java (original) +++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/DefaultHISEUserDetails.java Wed Feb 24 13:18:37 2010 @@ -40,15 +40,17 @@ public String getUserPassword(String user1) { OrgEntity user = hiseDao.find(OrgEntity.class, user1); - return user.getUserPassword(); + return user == null ? null : user.getUserPassword(); } public Collection getUserGroups(String user1) { OrgEntity user = hiseDao.find(OrgEntity.class, user1); Collection r = new ArrayList(); - for (OrgEntity g : user.getUserGroups()) { - Validate.isTrue(g.getType() == OrgEntityType.GROUP); - r.add(g.getName()); + if (user != null) { + for (OrgEntity g : user.getUserGroups()) { + Validate.isTrue(g.getType() == OrgEntityType.GROUP); + r.add(g.getName()); + } } return r; } Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TaskOperationsImpl.java URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TaskOperationsImpl.java?rev=915778&r1=915777&r2=915778&view=diff ============================================================================== --- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TaskOperationsImpl.java (original) +++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TaskOperationsImpl.java Wed Feb 24 13:18:37 2010 @@ -321,6 +321,7 @@ public void forward(String identifier, TOrganizationalEntity organizationalEntity) throws IllegalAccessFault, IllegalStateFault, IllegalArgumentFault { Task t = Task.load(hiseEngine, Long.parseLong(identifier)); + t.setCurrentUser(loadUser()); t.forward(organizationalEntity); } @@ -346,6 +347,7 @@ public Object getInput(String identifier, String part) throws IllegalAccessFault, IllegalStateFault, IllegalArgumentFault { Task t = Task.load(hiseEngine, Long.parseLong(identifier)); + t.setCurrentUser(getUserString()); return t.getInput(part); } @@ -381,12 +383,14 @@ public void remove(String identifier) throws IllegalAccessFault, IllegalArgumentFault { Task t = Task.load(hiseEngine, Long.parseLong(identifier)); + t.setCurrentUser(getUserString()); t.remove(); } public void resume(String identifier) throws IllegalAccessFault, IllegalStateFault, IllegalArgumentFault { // OrgEntity user = loadUser(); Task t = Task.load(hiseEngine, Long.parseLong(identifier)); + t.setCurrentUser(getUserString()); t.resume(); } @@ -416,16 +420,19 @@ public void stop(String identifier) throws IllegalAccessFault, IllegalStateFault, IllegalArgumentFault { Task t = Task.load(hiseEngine, Long.parseLong(identifier)); + t.setCurrentUser(getUserString()); t.stop(); } public void suspend(String identifier) throws IllegalAccessFault, IllegalStateFault, IllegalArgumentFault { Task t = Task.load(hiseEngine, Long.parseLong(identifier)); + t.setCurrentUser(getUserString()); t.suspend(); } public void suspendUntil(String identifier, TTime time) throws IllegalAccessFault, IllegalStateFault, IllegalArgumentFault { Task t = Task.load(hiseEngine, Long.parseLong(identifier)); + t.setCurrentUser(getUserString()); Date when = time.getPointOfTime(); if (when == null) { Duration when2 = time.getTimePeriod();