svn commit: r944215 - in /jackrabbit/trunk/jackrabbit-standalone/src/main: java/org/apache/jackrabbit/standalone/cli/nodetype/ resources/org/apache/jackrabbit/standalone/cli/

[ju...@apache.org]

Author: jukka
Date: Fri May 14 12:06:48 2010
New Revision: 944215

URL: http://svn.apache.org/viewvc?rev=944215&view=rev
Log:
JCR-2628: registerNodeType is not implemented in the CLI

Patch by Norman Maurer

Added:
    jackrabbit/trunk/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/cli/nodetype/
    jackrabbit/trunk/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/cli/nodetype/RegisterNodeType.java   (with props)
Modified:
    jackrabbit/trunk/jackrabbit-standalone/src/main/resources/org/apache/jackrabbit/standalone/cli/command.xml

Added: jackrabbit/trunk/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/cli/nodetype/RegisterNodeType.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/cli/nodetype/RegisterNodeType.java?rev=944215&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/cli/nodetype/RegisterNodeType.java (added)
+++ jackrabbit/trunk/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/cli/nodetype/RegisterNodeType.java Fri May 14 12:06:48 2010
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.jackrabbit.standalone.cli.nodetype;
+
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import org.apache.commons.chain.Command;
+import org.apache.commons.chain.Context;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jackrabbit.commons.cnd.CndImporter;
+import org.apache.jackrabbit.standalone.cli.CommandHelper;
+
+/**
+ * Register node types via CND file
+ *
+ */
+public class RegisterNodeType implements Command {
+
+    private static final Log log = LogFactory.getLog(RegisterNodeType.class);
+
+    private final String srcFsPathKey = "srcFsPath";
+
+    /*
+     * (non-Javadoc)
+     * @see org.apache.commons.chain.Command#execute(org.apache.commons.chain.Context)
+     */
+    public boolean execute(Context context) throws Exception {
+        String path = (String) context.get(srcFsPathKey);
+
+        // Register the custom node types defined in the CND file
+        InputStream is = new FileInputStream(path);
+
+        if (log.isDebugEnabled()) {
+              log.debug("Import CND from path " + path);
+        } 
+        CndImporter.registerNodeTypes(new InputStreamReader(is), CommandHelper.getSession(context));
+        return false;
+    }
+
+}

Propchange: jackrabbit/trunk/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/cli/nodetype/RegisterNodeType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-standalone/src/main/resources/org/apache/jackrabbit/standalone/cli/command.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-standalone/src/main/resources/org/apache/jackrabbit/standalone/cli/command.xml?rev=944215&r1=944214&r2=944215&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-standalone/src/main/resources/org/apache/jackrabbit/standalone/cli/command.xml (original)
+++ jackrabbit/trunk/jackrabbit-standalone/src/main/resources/org/apache/jackrabbit/standalone/cli/command.xml Fri May 14 12:06:48 2010
@@ -193,6 +193,9 @@
 
 		<command name="registerNamespace"
 			className="org.apache.jackrabbit.standalone.cli.namespace.RegisterNamespace"/>
+			
+		<command name="registerNodeType"
+			className="org.apache.jackrabbit.standalone.cli.nodetype.RegisterNodeType"/>
 
 		<command name="removeItem"
 			className="org.apache.jackrabbit.standalone.cli.core.RemoveItem"/>