Author: fchrist
Date: Fri Dec 3 14:06:59 2010
New Revision: 1041823
URL: http://svn.apache.org/viewvc?rev=1041823&view=rev
Log:
Fix for STANBOL-7. Changed encoding of SolrFieldMapper.java to UTF-8 and set
default encoding in parent POM.
Modified:
incubator/stanbol/trunk/rick/parent/pom.xml
incubator/stanbol/trunk/rick/yard/solr/src/main/java/eu/iksproject/rick/yard/solr/impl/SolrFieldMapper.java
Modified: incubator/stanbol/trunk/rick/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rick/parent/pom.xml?rev=1041823&r1=1041822&r2=1041823&view=diff
==============================================================================
--- incubator/stanbol/trunk/rick/parent/pom.xml (original)
+++ incubator/stanbol/trunk/rick/parent/pom.xml Fri Dec 3 14:06:59 2010
@@ -1,322 +1,329 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- IKS RICK software is licensed under the Apache License, Version 2.0,
- see 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.
- -->
+ <!--
+ IKS RICK software is licensed under the Apache License, Version
2.0,
+ see 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/maven-v4_0_0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.rick.parent</artifactId>
- <packaging>pom</packaging>
- <version>0.1-SNAPSHOT</version>
-
- <name>IKS RICK parent POM</name>
- <description>
- Parent POM for the RICK project
- </description>
-
- <inceptionYear>2010</inceptionYear>
-
- <scm>
- <connection>
- scm:svn:http://iks-project.googlecode.com/svn/sandbox/rick/trunk/parent
- </connection>
- <developerConnection>
- scm:svn:https://iks-project.googlecode.com/svn/sandbox/rick/trunk/parent
- </developerConnection>
-
<url>http://wiki.iks-project.eu/index.php/Content-knowledge-reference-infrastructure</url>
- </scm>
-
- <build>
- <plugins>
-
- <!-- requires Java 6 because Clerezza artefacts are compiled
- using Java 6 -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-java</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <!-- Constraint disabled since even fixing the version for
- the maven eclipse plugin does not seem to make this rule pass
- <requirePluginVersions/>
- -->
- <requireJavaVersion>
- <message>
- Java 6 or higher is required to compile this module
- </message>
- <version>1.6</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- Attach sources for all builds -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- <pluginManagement>
- <plugins>
- <!-- Compile for >= Java 5-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.20</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
- <inherited>true</inherited>
- <configuration>
- <instructions>
- <Bundle-Category>rick</Bundle-Category>
- <Bundle-DocURL>
-
http://wiki.iks-project.eu/index.php/Content-knowledge-reference-infrastructure
- </Bundle-DocURL>
- <Bundle-Vendor>IKS project</Bundle-Vendor>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <_versionpolicy>$${version;===;$...@}}</_versionpolicy>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <version>1.4.2</version>
- <!--
- slf4j impl is needed when QDox inspects/loads classes
- that use a static field for the logger, so that those
- classes can be loaded.
- -->
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.2</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>generate-scr-scrdescriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- <configuration>
- <properties>
- <service.vendor>IKS project</service.vendor>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- <version>2.0.4-incubator</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.1.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.8</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <developers>
- <!-- TBD -->
- </developers>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- <version>2.5.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.2.0</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <profiles>
- <profile>
- <id>installBundle</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- <executions>
- <execution>
- <id>install-bundle</id>
- <goals>
- <goal>install</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <!-- needed because of Clerezza dependency -->
- <repositories>
- <repository>
- <id>apache.snapshot</id>
- <name>apache snapshots repository</name>
- <snapshots>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </snapshots>
- <url>http://repository.apache.org/content/groups/snapshots-group</url>
- <layout>default</layout>
- </repository>
- <repository>
- <id>apache</id>
- <name>apache repository</name>
- <url>https://repository.apache.org/content/groups/public</url>
- </repository>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/2</url>
- </repository>
- <!-- currently not needed (rw)
- <repository>
- <id>com.springsource.repository.bundles.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Bundle
Releases</name>
- <url>http://repository.springsource.com/maven/bundles/external</url>
- </repository> -->
- </repositories>
+ <groupId>eu.iksproject</groupId>
+ <artifactId>eu.iksproject.rick.parent</artifactId>
+ <packaging>pom</packaging>
+ <version>0.1-SNAPSHOT</version>
+
+ <name>IKS RICK parent POM</name>
+ <description>
+ Parent POM for the RICK project
+ </description>
+
+ <inceptionYear>2010</inceptionYear>
+
+ <scm>
+ <connection>
+
scm:svn:http://iks-project.googlecode.com/svn/sandbox/rick/trunk/parent
+ </connection>
+ <developerConnection>
+
scm:svn:https://iks-project.googlecode.com/svn/sandbox/rick/trunk/parent
+ </developerConnection>
+
<url>http://wiki.iks-project.eu/index.php/Content-knowledge-reference-infrastructure</url>
+ </scm>
+
+ <properties>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+
+ <!--
+ requires Java 6 because Clerezza artefacts are
compiled using Java 6
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-java</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <!--
+
Constraint disabled since even fixing the version for the maven
+ eclipse
plugin does not seem to make this rule pass
+
<requirePluginVersions/>
+ -->
+
<requireJavaVersion>
+
<message>
+
Java 6 or higher is required to compile this module
+ </message>
+
<version>1.6</version>
+
</requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Attach sources for all builds -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ <pluginManagement>
+ <plugins>
+ <!-- Compile for >= Java 5-->
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-dependency-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-war-plugin</artifactId>
+ <version>2.1-beta-1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+
<artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.20</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+
<artifactId>maven-bundle-plugin</artifactId>
+ <version>2.0.1</version>
+ <inherited>true</inherited>
+ <configuration>
+ <instructions>
+
<Bundle-Category>rick</Bundle-Category>
+ <Bundle-DocURL>
+
http://wiki.iks-project.eu/index.php/Content-knowledge-reference-infrastructure
+ </Bundle-DocURL>
+ <Bundle-Vendor>IKS
project</Bundle-Vendor>
+
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+
<_versionpolicy>$${version;===;$...@}}</_versionpolicy>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+
<artifactId>maven-scr-plugin</artifactId>
+ <version>1.4.2</version>
+ <!--
+ slf4j impl is needed when QDox
inspects/loads classes that use a
+ static field for the logger, so
that those classes can be loaded.
+ -->
+ <dependencies>
+ <dependency>
+
<groupId>org.slf4j</groupId>
+
<artifactId>slf4j-simple</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+
<id>generate-scr-scrdescriptor</id>
+ <goals>
+ <goal>scr</goal>
+ </goals>
+ <configuration>
+ <properties>
+
<service.vendor>IKS project</service.vendor>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+
<artifactId>maven-sling-plugin</artifactId>
+ <version>2.0.4-incubator</version>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-deploy-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-install-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-site-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <developers>
+ <!-- TBD -->
+ </developers>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <version>2.5.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+
<artifactId>org.apache.felix.scr.annotations</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <profiles>
+ <profile>
+ <id>installBundle</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.apache.sling</groupId>
+
<artifactId>maven-sling-plugin</artifactId>
+ <executions>
+ <execution>
+
<id>install-bundle</id>
+ <goals>
+
<goal>install</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <!-- needed because of Clerezza dependency -->
+ <repositories>
+ <repository>
+ <id>apache.snapshot</id>
+ <name>apache snapshots repository</name>
+ <snapshots>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </snapshots>
+
<url>http://repository.apache.org/content/groups/snapshots-group</url>
+ <layout>default</layout>
+ </repository>
+ <repository>
+ <id>apache</id>
+ <name>apache repository</name>
+
<url>https://repository.apache.org/content/groups/public</url>
+ </repository>
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/2</url>
+ </repository>
+ <!--
+ currently not needed (rw) <repository>
+ <id>com.springsource.repository.bundles.external</id>
+ <name>SpringSource Enterprise Bundle Repository -
External Bundle
+ Releases</name>
+
<url>http://repository.springsource.com/maven/bundles/external</url>
+ </repository>
+ -->
+ </repositories>
</project>
Modified:
incubator/stanbol/trunk/rick/yard/solr/src/main/java/eu/iksproject/rick/yard/solr/impl/SolrFieldMapper.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rick/yard/solr/src/main/java/eu/iksproject/rick/yard/solr/impl/SolrFieldMapper.java?rev=1041823&r1=1041822&r2=1041823&view=diff
==============================================================================
---
incubator/stanbol/trunk/rick/yard/solr/src/main/java/eu/iksproject/rick/yard/solr/impl/SolrFieldMapper.java
(original)
+++
incubator/stanbol/trunk/rick/yard/solr/src/main/java/eu/iksproject/rick/yard/solr/impl/SolrFieldMapper.java
Fri Dec 3 14:06:59 2010
@@ -509,7 +509,7 @@ public class SolrFieldMapper implements
* {...@link #NAMESPACE_PREFIX_SEPERATOR_CHAR} this method returns the
parsed
* String.<p>
* The local name may contain the {...@link
#NAMESPACE_PREFIX_SEPERATOR_CHAR}
- * �...@link #NAMESPACE_PREFIX_SEPERATOR_CHAR}'. The prefix MUST NOT
contain
+ * Ã...@link #NAMESPACE_PREFIX_SEPERATOR_CHAR}'. The prefix MUST NOT
contain
* this char, because {...@link String#indexOf(int)} is used to split
prefix
* and local name.
* @param shortFieldName the short name
