Modify the change line tag crlf to lf, modify check style, add the parser calling in package manager, remove Chinese comment.

Change-Id: I77226cb8d69b8a62c8364e371b83fdb9e462ce1d
Signed-off-by: nancylizi <li.zi30@zte.com.cn>

1 files changed, 305 insertions, 305 deletions

diff --git a/catalog-core/catalog-mgr/pom.xml b/catalog-core/catalog-mgr/pom.xml
index 12fb85a4..efc1a26e 100644
--- a/catalog-core/catalog-mgr/pom.xml
+++ b/catalog-core/catalog-mgr/pom.xml
@@ -1,305 +1,305 @@
-<!--

-

-    Copyright 2016 [ZTE] and others.

-

-    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.

-

--->

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-    <parent>

-        <groupId>org.openo.common-tosca.catalog</groupId>

-        <artifactId>catalog-core-parent</artifactId>

-        <version>1.0.0-SNAPSHOT</version>

-    </parent>

-

-    <modelVersion>4.0.0</modelVersion>

-    <artifactId>catalog-mgr</artifactId>

-    <name>openo/commontosca/catalog/catalog-mgr</name>

-    <packaging>jar</packaging>

-	<properties>

-		<httpclient.version>4.4.1</httpclient.version>

-    </properties>

-

-    <build>

-        <plugins>

-            <plugin>

-                <groupId>org.eclipse.m2e</groupId>

-                <artifactId>lifecycle-mapping</artifactId> 

-                <configuration>

-                    <lifecycleMappingMetadata>

-                        <pluginExecutions>

-                            <pluginExecution>

-                                <pluginExecutionFilter>

-                                    <groupId>org.apache.maven.plugins</groupId>

-                                    <artifactId>maven-dependency-plugin</artifactId>

-                                    <versionRange>[2.0,)</versionRange>

-                                    <goals>

-                                        <goal>copy-dependencies</goal>

-                                    </goals>

-                                </pluginExecutionFilter>

-                                <action>

-                                    <ignore />

-                                </action>

-                            </pluginExecution>

-                        </pluginExecutions>

-                    </lifecycleMappingMetadata>

-                </configuration>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <configuration>

-                    <archive>

-                        <manifest>

-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-shade-plugin</artifactId>

-                <configuration>

-                    <createDependencyReducedPom>true</createDependencyReducedPom>

-                    <filters>

-                        <filter>

-                            <artifact>*:*</artifact>

-                            <excludes>

-                                <exclude>META-INF/*.SF</exclude>

-                                <exclude>META-INF/*.DSA</exclude>

-                                <exclude>META-INF/*.RSA</exclude>

-                            </excludes>

-                        </filter>

-                    </filters>

-                </configuration>

-                <executions>

-                    <execution>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>shade</goal>

-                        </goals>

-                        <configuration>

-                            <transformers>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>

-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">

-                                    <mainClass>org.openo.commontosca.catalog.catalogApp</mainClass>

-                                </transformer>

-                            </transformers>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-dependency-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>copy-dependencies</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>copy-dependencies</goal>

-                        </goals>

-                        <configuration>

-                            <artifactItems>

-                                <artifactItem>

-                                    <groupId>io.dropwizard</groupId>

-                                    <artifactId>dropwizard-core</artifactId>

-                                    <version>${dropwizard.version}</version>

-                                    <overWrite>true</overWrite>

-                                </artifactItem>

-                            </artifactItems>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-

-    <dependencies>

-        <!-- dropwizard -->

-        <dependency>

-            <groupId>io.dropwizard</groupId>

-            <artifactId>dropwizard-core</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>io.dropwizard</groupId>

-            <artifactId>dropwizard-assets</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>io.dropwizard</groupId>

-            <artifactId>dropwizard-hibernate</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>io.dropwizard</groupId>

-            <artifactId>dropwizard-migrations</artifactId>

-        </dependency>

-        <!-- swagger -->

-        <dependency>

-            <groupId>io.swagger</groupId>

-            <artifactId>swagger-jersey2-jaxrs</artifactId>

-        </dependency>

-        <!-- lombok -->

-        <dependency>

-            <groupId>org.projectlombok</groupId>

-            <artifactId>lombok</artifactId>

-        </dependency>

-        <!-- jersey -->

-        <dependency>

-            <groupId>org.glassfish.jersey.core</groupId>

-            <artifactId>jersey-server</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>org.glassfish.jersey.media</groupId>

-            <artifactId>jersey-media-multipart</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>org.glassfish.jersey.containers</groupId>

-            <artifactId>jersey-container-servlet-core</artifactId>

-        </dependency>

-        <!-- consumer -->

-        <dependency>

-            <groupId>com.eclipsesource.jaxrs</groupId>

-            <artifactId>consumer</artifactId>

-            <exclusions>

-                <exclusion>

-                    <groupId>com.eclipsesource.jaxrs</groupId>

-                    <artifactId>jersey-all</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-        <!-- jackson -->

-        <dependency>

-            <groupId>com.fasterxml.jackson.dataformat</groupId>

-            <artifactId>jackson-dataformat-xml</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>com.fasterxml.jackson.core</groupId>

-            <artifactId>jackson-annotations</artifactId>

-        </dependency>

-        <!-- gson -->

-        <dependency>

-            <groupId>com.google.code.gson</groupId>

-            <artifactId>gson</artifactId>

-        </dependency>

-        <!-- dom4j -->

-        <dependency>

-            <groupId>dom4j</groupId>

-            <artifactId>dom4j</artifactId>

-        </dependency>

-        <!-- cometd -->

-        <dependency>

-            <groupId>org.cometd.java</groupId>

-            <artifactId>bayeux-api</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>org.cometd.java</groupId>

-            <artifactId>cometd-java-annotations</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>org.cometd.java</groupId>

-            <artifactId>cometd-java-client</artifactId>

-            <version>${cometd.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.cometd.java</groupId>

-            <artifactId>cometd-java-common</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>org.cometd.java</groupId>

-            <artifactId>cometd-java-oort</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>org.cometd.java</groupId>

-            <artifactId>cometd-java-server</artifactId>

-        </dependency>

-        <!-- ftp -->

-        <dependency>

-            <groupId>commons-net</groupId>

-            <artifactId>commons-net</artifactId>

-        </dependency>

-        <!-- mysql -->

-        <dependency>

-            <groupId>mysql</groupId>

-            <artifactId>mysql-connector-java</artifactId>

-        </dependency>

-        <!-- http server -->

-        <dependency>

-            <groupId>commons-fileupload</groupId>

-            <artifactId>commons-fileupload</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>commons-io</groupId>

-            <artifactId>commons-io</artifactId>

-        </dependency>

-        <!-- UT -->

-        <dependency>

-            <groupId>io.dropwizard</groupId>

-            <artifactId>dropwizard-testing</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>  

-            <groupId>junit</groupId>  

-            <artifactId>junit</artifactId>  

-            <scope>test</scope>

-        </dependency> 

-        <dependency> 

-            <groupId>org.powermock</groupId> 

-            <artifactId>powermock-module-junit4</artifactId> 

-            <scope>test</scope>

-        </dependency> 

-        <dependency> 

-            <groupId>org.powermock</groupId> 

-            <artifactId>powermock-api-mockito</artifactId> 

-            <scope>test</scope>

-        </dependency> 

-        <dependency>

-            <groupId>org.mockito</groupId>

-            <artifactId>mockito-all</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>com.h2database</groupId>

-            <artifactId>h2</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.ant</groupId>

-            <artifactId>ant</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <!-- UT end -->

-        <!-- httpclient-->

-	    <dependency>

-            <groupId>org.apache.httpcomponents</groupId>

-            <artifactId>httpclient</artifactId>

-            <version>${httpclient.version}</version>

-            <exclusions>

-                <!-- provided by jcl-over-slf4j to enable logging via logback -->

-                <exclusion>

-                    <groupId>commons-logging</groupId>

-                    <artifactId>commons-logging</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-	    <dependency>

-            <groupId>org.apache.httpcomponents</groupId>

-            <artifactId>httpcore</artifactId>

-            <version>${httpclient.version}</version>

-        </dependency>

-		<dependency>

-			<groupId>org.apache.httpcomponents</groupId>

-			<artifactId>httpmime</artifactId>

-			<version>${httpclient.version}</version>

-		</dependency>

-    </dependencies>

-</project>

+<!--
+
+    Copyright 2016 [ZTE] and others.
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.openo.common-tosca.catalog</groupId>
+        <artifactId>catalog-core-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>catalog-mgr</artifactId>
+    <name>openo/commontosca/catalog/catalog-mgr</name>
+    <packaging>jar</packaging>
+	<properties>
+		<httpclient.version>4.4.1</httpclient.version>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.eclipse.m2e</groupId>
+                <artifactId>lifecycle-mapping</artifactId> 
+                <configuration>
+                    <lifecycleMappingMetadata>
+                        <pluginExecutions>
+                            <pluginExecution>
+                                <pluginExecutionFilter>
+                                    <groupId>org.apache.maven.plugins</groupId>
+                                    <artifactId>maven-dependency-plugin</artifactId>
+                                    <versionRange>[2.0,)</versionRange>
+                                    <goals>
+                                        <goal>copy-dependencies</goal>
+                                    </goals>
+                                </pluginExecutionFilter>
+                                <action>
+                                    <ignore />
+                                </action>
+                            </pluginExecution>
+                        </pluginExecutions>
+                    </lifecycleMappingMetadata>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <configuration>
+                    <createDependencyReducedPom>true</createDependencyReducedPom>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
+                                <exclude>META-INF/*.RSA</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>org.openo.commontosca.catalog.catalogApp</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>io.dropwizard</groupId>
+                                    <artifactId>dropwizard-core</artifactId>
+                                    <version>${dropwizard.version}</version>
+                                    <overWrite>true</overWrite>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <!-- dropwizard -->
+        <dependency>
+            <groupId>io.dropwizard</groupId>
+            <artifactId>dropwizard-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.dropwizard</groupId>
+            <artifactId>dropwizard-assets</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.dropwizard</groupId>
+            <artifactId>dropwizard-hibernate</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.dropwizard</groupId>
+            <artifactId>dropwizard-migrations</artifactId>
+        </dependency>
+        <!-- swagger -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-jersey2-jaxrs</artifactId>
+        </dependency>
+        <!-- lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <!-- jersey -->
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-multipart</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet-core</artifactId>
+        </dependency>
+        <!-- consumer -->
+        <dependency>
+            <groupId>com.eclipsesource.jaxrs</groupId>
+            <artifactId>consumer</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.eclipsesource.jaxrs</groupId>
+                    <artifactId>jersey-all</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- jackson -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <!-- gson -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+        <!-- dom4j -->
+        <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+        </dependency>
+        <!-- cometd -->
+        <dependency>
+            <groupId>org.cometd.java</groupId>
+            <artifactId>bayeux-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.cometd.java</groupId>
+            <artifactId>cometd-java-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.cometd.java</groupId>
+            <artifactId>cometd-java-client</artifactId>
+            <version>${cometd.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.cometd.java</groupId>
+            <artifactId>cometd-java-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.cometd.java</groupId>
+            <artifactId>cometd-java-oort</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.cometd.java</groupId>
+            <artifactId>cometd-java-server</artifactId>
+        </dependency>
+        <!-- ftp -->
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+        </dependency>
+        <!-- mysql -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <!-- http server -->
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <!-- UT -->
+        <dependency>
+            <groupId>io.dropwizard</groupId>
+            <artifactId>dropwizard-testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>  
+            <groupId>junit</groupId>  
+            <artifactId>junit</artifactId>  
+            <scope>test</scope>
+        </dependency> 
+        <dependency> 
+            <groupId>org.powermock</groupId> 
+            <artifactId>powermock-module-junit4</artifactId> 
+            <scope>test</scope>
+        </dependency> 
+        <dependency> 
+            <groupId>org.powermock</groupId> 
+            <artifactId>powermock-api-mockito</artifactId> 
+            <scope>test</scope>
+        </dependency> 
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- UT end -->
+        <!-- httpclient-->
+	    <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
+            <exclusions>
+                <!-- provided by jcl-over-slf4j to enable logging via logback -->
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+	    <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>${httpclient.version}</version>
+        </dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpmime</artifactId>
+			<version>${httpclient.version}</version>
+		</dependency>
+    </dependencies>
+</project>