Return-Path: X-Original-To: apmail-chemistry-commits-archive@www.apache.org Delivered-To: apmail-chemistry-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 99BB874A1 for ; Sun, 11 Dec 2011 21:34:55 +0000 (UTC) Received: (qmail 89662 invoked by uid 500); 11 Dec 2011 21:34:55 -0000 Delivered-To: apmail-chemistry-commits-archive@chemistry.apache.org Received: (qmail 89634 invoked by uid 500); 11 Dec 2011 21:34:55 -0000 Mailing-List: contact commits-help@chemistry.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@chemistry.apache.org Delivered-To: mailing list commits@chemistry.apache.org Received: (qmail 89626 invoked by uid 99); 11 Dec 2011 21:34:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Dec 2011 21:34:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Sun, 11 Dec 2011 21:34:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2FB4F23889E1; Sun, 11 Dec 2011 21:34:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1213082 - in /chemistry/playground/moreq2010/moreq2010: ./ src/main/java/org/apache/chemistry/moreq2010/util/ Date: Sun, 11 Dec 2011 21:34:29 -0000 To: commits@chemistry.apache.org From: jens@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111211213430.2FB4F23889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jens Date: Sun Dec 11 21:34:29 2011 New Revision: 1213082 URL: http://svn.apache.org/viewvc?rev=1213082&view=rev Log: MoReq2010 example code in playground: fix bugs, add manifest, allow command line parameters Modified: chemistry/playground/moreq2010/moreq2010/pom.xml chemistry/playground/moreq2010/moreq2010/src/main/java/org/apache/chemistry/moreq2010/util/CmisClient.java chemistry/playground/moreq2010/moreq2010/src/main/java/org/apache/chemistry/moreq2010/util/Main.java chemistry/playground/moreq2010/moreq2010/src/main/java/org/apache/chemistry/moreq2010/util/Validator.java Modified: chemistry/playground/moreq2010/moreq2010/pom.xml URL: http://svn.apache.org/viewvc/chemistry/playground/moreq2010/moreq2010/pom.xml?rev=1213082&r1=1213081&r2=1213082&view=diff ============================================================================== --- chemistry/playground/moreq2010/moreq2010/pom.xml (original) +++ chemistry/playground/moreq2010/moreq2010/pom.xml Sun Dec 11 21:34:29 2011 @@ -135,6 +135,16 @@ ${project.build.outputDirectory}/META-INF/MANIFEST.MF + false + + org.apache.chemistry.moreq2010.util.Main + true + + + + ${maven.compile.source} + ${maven.compile.target} + Modified: chemistry/playground/moreq2010/moreq2010/src/main/java/org/apache/chemistry/moreq2010/util/CmisClient.java URL: http://svn.apache.org/viewvc/chemistry/playground/moreq2010/moreq2010/src/main/java/org/apache/chemistry/moreq2010/util/CmisClient.java?rev=1213082&r1=1213081&r2=1213082&view=diff ============================================================================== --- chemistry/playground/moreq2010/moreq2010/src/main/java/org/apache/chemistry/moreq2010/util/CmisClient.java (original) +++ chemistry/playground/moreq2010/moreq2010/src/main/java/org/apache/chemistry/moreq2010/util/CmisClient.java Sun Dec 11 21:34:29 2011 @@ -45,6 +45,7 @@ import org.apache.chemistry.moreq2010.ja import org.apache.chemistry.moreq2010.jaxb.EventTYPE; import org.apache.chemistry.moreq2010.jaxb.Export; import org.apache.chemistry.moreq2010.jaxb.GroupTYPE; +import org.apache.chemistry.moreq2010.jaxb.GroupmembershipTYPE; import org.apache.chemistry.moreq2010.jaxb.HeldTYPE; import org.apache.chemistry.moreq2010.jaxb.HierarchicalClass; import org.apache.chemistry.moreq2010.jaxb.MceTYPE; @@ -524,6 +525,11 @@ public class CmisClient implements Moreq properties.put(Constants.DESCRIPTION , user.getDescription().getValue() ); properties.put(Constants.FIRST_USED_TIMESTAMP , convert(user.getFirstUsed())); properties.put(Constants.DESTROYED_TIMESTAMP , convert(user.getDestroyed())); + if (user.getGroupMembership() != null && user.getGroupMembership().getGroupId() != null) { + GroupmembershipTYPE groups = user.getGroupMembership(); + if (groups.getGroupId().size() > 0) + properties.put(Constants.GROUP_IDENTIFIER, groups.getGroupId()); + } // TODO: contextual metadada Document doc = usersFolder.createDocument(properties, null, VersioningState.NONE); Modified: chemistry/playground/moreq2010/moreq2010/src/main/java/org/apache/chemistry/moreq2010/util/Main.java URL: http://svn.apache.org/viewvc/chemistry/playground/moreq2010/moreq2010/src/main/java/org/apache/chemistry/moreq2010/util/Main.java?rev=1213082&r1=1213081&r2=1213082&view=diff ============================================================================== --- chemistry/playground/moreq2010/moreq2010/src/main/java/org/apache/chemistry/moreq2010/util/Main.java (original) +++ chemistry/playground/moreq2010/moreq2010/src/main/java/org/apache/chemistry/moreq2010/util/Main.java Sun Dec 11 21:34:29 2011 @@ -46,7 +46,9 @@ public class Main { public static void main( String[] args ) { LOG.info("Main starting..."); - String inputFileName = "src/test/resources/example1.xml"; + String inputFileName = args.length > 0 ? args[0] : null; + if (null == inputFileName || inputFileName.length() == 0) + inputFileName = "src/test/resources/example1.xml"; try { MoreqParserCallback cmisClient = ParserCallbackFactory.createParserCallback(CmisClient.class.getName()); MoreqXmlParser parser = new MoreqXmlParser(cmisClient); Modified: chemistry/playground/moreq2010/moreq2010/src/main/java/org/apache/chemistry/moreq2010/util/Validator.java URL: http://svn.apache.org/viewvc/chemistry/playground/moreq2010/moreq2010/src/main/java/org/apache/chemistry/moreq2010/util/Validator.java?rev=1213082&r1=1213081&r2=1213082&view=diff ============================================================================== --- chemistry/playground/moreq2010/moreq2010/src/main/java/org/apache/chemistry/moreq2010/util/Validator.java (original) +++ chemistry/playground/moreq2010/moreq2010/src/main/java/org/apache/chemistry/moreq2010/util/Validator.java Sun Dec 11 21:34:29 2011 @@ -49,7 +49,12 @@ public class Validator { Document doc = null; try { DocumentBuilder parser = factory.newDocumentBuilder(); - String fileName = "src/test/resources/example1.xml"; + String fileName = args[0]; + if (args.length > 0) + fileName = args[0]; + else + fileName = "src/test/resources/example1.xml"; + doc = parser.parse(fileName); System.out.println("Parsing of file " + fileName + " succeded."); fileName = "src/test/resources/example2.xml";