incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From enor...@apache.org
Subject svn commit: r960730 - in /sling/trunk/bundles/jcr/contentloader/src/main: java/org/apache/sling/jcr/contentloader/internal/DefaultContentImporter.java resources/OSGI-INF/ resources/OSGI-INF/metatype/ resources/OSGI-INF/metatype/metatype.properties
Date Mon, 05 Jul 2010 23:14:14 GMT
Author: enorman
Date: Mon Jul  5 23:14:14 2010
New Revision: 960730

URL: http://svn.apache.org/viewvc?rev=960730&view=rev
Log:
SLING-1589 DefaultContentImporter service doesn't have a pretty name/description

Added:
    sling/trunk/bundles/jcr/contentloader/src/main/resources/OSGI-INF/
    sling/trunk/bundles/jcr/contentloader/src/main/resources/OSGI-INF/metatype/
    sling/trunk/bundles/jcr/contentloader/src/main/resources/OSGI-INF/metatype/metatype.properties
  (with props)
Modified:
    sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentImporter.java

Modified: sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentImporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentImporter.java?rev=960730&r1=960729&r2=960730&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentImporter.java
(original)
+++ sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentImporter.java
Mon Jul  5 23:14:14 2010
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
  *                description="%content.import.service.description"
  * @scr.property name="service.vendor" value="The Apache Software Foundation"
  * @scr.property name="service.description"
- *               value="Apache Sling Contnet Importer Service"
+ *               value="Apache Sling JCR Content Import Service"
  * @scr.service interface="org.apache.sling.jcr.contentloader.ContentImporter"
  */
 public class DefaultContentImporter extends BaseImportLoader implements JcrContentHelper,
ContentImporter {

Added: sling/trunk/bundles/jcr/contentloader/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=960730&view=auto
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/main/resources/OSGI-INF/metatype/metatype.properties
(added)
+++ sling/trunk/bundles/jcr/contentloader/src/main/resources/OSGI-INF/metatype/metatype.properties
Mon Jul  5 23:14:14 2010
@@ -0,0 +1,29 @@
+#
+#  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.
+#
+
+#
+# This file contains localization strings for configuration labels and
+# descriptions as used in the metatype.xml descriptor generated by the
+# the Sling SCR plugin
+
+#
+# Default content import service implementation
+content.import.service.name=Apache Sling JCR Content Import Service
+content.import.service.description=Import content into the repository by parsing the supplied
content stream.
+

Propchange: sling/trunk/bundles/jcr/contentloader/src/main/resources/OSGI-INF/metatype/metatype.properties
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message