Changeset 4326
- Timestamp:
- 01/23/14 15:09:04 (10 years ago)
- Location:
- vlo/branches/vlo-3.0
- Files:
-
- 3 added
- 7 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
vlo/branches/vlo-3.0/pom.xml
r4322 r4326 27 27 28 28 <properties> 29 <solr.version>4.6.0</solr.version> 30 <slf4j.version>1.7.5</slf4j.version> 29 31 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 30 32 </properties> 33 34 <dependencies> 35 <dependency> 36 <groupId>org.slf4j</groupId> 37 <artifactId>slf4j-api</artifactId> 38 <version>${slf4j.version}</version> 39 </dependency> 40 41 <dependency> 42 <groupId>junit</groupId> 43 <artifactId>junit</artifactId> 44 <version>4.11</version> 45 <scope>test</scope> 46 </dependency> 47 </dependencies> 31 48 32 49 <build> -
vlo/branches/vlo-3.0/vlo-importer/pom.xml
r4322 r4326 4 4 5 5 > 6 <parent> 7 <groupId>eu.clarin.cmdi</groupId> 8 <artifactId>vlo</artifactId> 9 <version>3.0-SNAPSHOT</version> 10 </parent> 11 6 12 <modelVersion>4.0.0</modelVersion> 7 8 13 <groupId>eu.clarin.cmdi</groupId> 9 10 14 <artifactId>vlo-importer</artifactId> 11 15 <version>3.0-SNAPSHOT</version> 12 16 <packaging>jar</packaging> 13 17 14 <version>3.0-SNAPSHOT</version>15 18 <name>VLO Importer</name> 16 19 <description></description> … … 20 23 <packaging>jar</packaging> 21 24 <netbeans.hint.deploy.server>Tomcat</netbeans.hint.deploy.server> 25 <log4j.appender>File</log4j.appender> 22 26 </properties> 27 28 <profiles> 29 <profile> 30 <id>dev</id> 31 <properties> 32 <log4j.appender>Stdout</log4j.appender> 33 </properties> 34 </profile> 35 </profiles> 23 36 24 37 <build> … … 123 136 <groupId>org.apache.solr</groupId> 124 137 <artifactId>solr-solrj</artifactId> 125 <version> 3.6.0</version>138 <version>${solr.version}</version> 126 139 </dependency> 127 140 <dependency> … … 132 145 <dependency> 133 146 <groupId>org.slf4j</groupId> 134 <artifactId>slf4j-api</artifactId>135 <version>1.6.1</version>136 </dependency>137 <dependency>138 <groupId>org.slf4j</groupId>139 147 <artifactId>slf4j-log4j12</artifactId> 140 <version>1.6.1</version> 141 </dependency> 142 <dependency> 143 <groupId>log4j</groupId> 144 <artifactId>log4j</artifactId> 145 <version>1.2.14</version> 146 </dependency> 147 <dependency> 148 <groupId>junit</groupId> 149 <artifactId>junit</artifactId> 150 <version>4.6</version> 151 <scope>test</scope> 148 <version>${slf4j.version}</version> 152 149 </dependency> 153 150 <dependency> -
vlo/branches/vlo-3.0/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java
r4030 r4326 25 25 import org.apache.commons.io.FileUtils; 26 26 import org.apache.solr.client.solrj.SolrServerException; 27 import org.apache.solr.client.solrj.impl. StreamingUpdateSolrServer;27 import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrServer; 28 28 import org.apache.solr.client.solrj.util.ClientUtils; 29 29 import org.apache.solr.common.SolrInputDocument; … … 63 63 * the solr server. 64 64 */ 65 private StreamingUpdateSolrServer solrServer;65 private ConcurrentUpdateSolrServer solrServer; 66 66 /** 67 67 * Defines the post-processor associations. At import, for each facet value, … … 236 236 * threads, two of them, emptying it. 237 237 */ 238 solrServer = new StreamingUpdateSolrServer(solrUrl,238 solrServer = new ConcurrentUpdateSolrServer(solrUrl, 239 239 VloConfig.getMinDocsInSolrQueue(), 2) { 240 240 /* -
vlo/branches/vlo-3.0/vlo-importer/src/main/resources/log4j.properties
r3148 r4326 6 6 log4j.appender.Stdout.encoding=UTF-8 7 7 8 log4j.appender. ROOT.File=vlo-importer.log9 log4j.appender. ROOT=org.apache.log4j.DailyRollingFileAppender10 log4j.appender. ROOT.layout=org.apache.log4j.PatternLayout11 log4j.appender. ROOT.layout.ConversionPattern=%d %p [%c#%M:%L] - %m%n12 log4j.appender. ROOT.encoding=UTF-88 log4j.appender.File.File=vlo-importer.log 9 log4j.appender.File=org.apache.log4j.DailyRollingFileAppender 10 log4j.appender.File.layout=org.apache.log4j.PatternLayout 11 log4j.appender.File.layout.ConversionPattern=%d %p [%c#%M:%L] - %m%n 12 log4j.appender.File.encoding=UTF-8 13 13 14 log4j.rootLogger=INFO, ROOT14 log4j.rootLogger=INFO, ${log4j.appender} 15 15 16 16 log4j.logger.org.springframework=ERROR -
vlo/branches/vlo-3.0/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java
r2768 r4326 5 5 import java.io.IOException; 6 6 import org.apache.commons.io.FileUtils; 7 import org.junit.After Class;8 import org.junit.Before Class;7 import org.junit.After; 8 import org.junit.Before; 9 9 10 10 public abstract class ImporterTestcase { 11 private staticFile testDir;11 private File testDir; 12 12 13 13 protected File createCmdiFile(String name, String content) throws IOException { … … 17 17 } 18 18 19 @After Class20 public staticvoid cleanup() {19 @After 20 public void cleanup() { 21 21 FileUtils.deleteQuietly(testDir); 22 22 } 23 23 24 @Before Class25 public staticvoid setup() {24 @Before 25 public void setup() { 26 26 final String baseTempPath = System.getProperty("java.io.tmpdir"); 27 27 testDir = new File(baseTempPath + File.separator + "testRegistry_" + System.currentTimeMillis()); -
vlo/branches/vlo-3.0/vlo-solr/pom.xml
r4322 r4326 1 1 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 2 2 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 3 <parent> 4 <groupId>eu.clarin.cmdi</groupId> 5 <artifactId>vlo</artifactId> 6 <version>3.0-SNAPSHOT</version> 7 </parent> 8 3 9 <modelVersion>4.0.0</modelVersion> 4 10 <groupId>eu.clarin.cmdi</groupId> 5 11 <artifactId>vlo-solr</artifactId> 12 <version>3.0-SNAPSHOT</version> 6 13 <packaging>war</packaging> 7 <version>3.6.0</version>14 8 15 <name>vlo-solr</name> 9 16 <description>VLO Solr server configuration and installation project.</description> 17 10 18 <dependencies> 11 19 <dependency> 12 20 <groupId>org.apache.solr</groupId> 13 21 <artifactId>solr-core</artifactId> 14 <version> 3.6.0</version>22 <version>${solr.version}</version> 15 23 <exclusions> 16 24 <exclusion> … … 24 32 <groupId>org.apache.solr</groupId> 25 33 <artifactId>solr-dataimporthandler</artifactId> 26 <version> 3.6.0</version>34 <version>${solr.version}</version> 27 35 </dependency> 28 36 <dependency> 29 37 <groupId>org.apache.solr</groupId> 30 38 <artifactId>solr-solrj</artifactId> 31 <version> 3.6.0</version>39 <version>${solr.version}</version> 32 40 </dependency> 33 41 <dependency> 34 42 <groupId>org.slf4j</groupId> 35 43 <artifactId>slf4j-log4j12</artifactId> 36 <version> 1.6.6</version>44 <version>${slf4j.version}</version> 37 45 </dependency> 38 46 <dependency> 39 <groupId> log4j</groupId>40 <artifactId> log4j</artifactId>41 <version> 1.2.14</version>47 <groupId>org.slf4j</groupId> 48 <artifactId>jcl-over-slf4j</artifactId> 49 <version>${slf4j.version}</version> 42 50 </dependency> 43 51 </dependencies> -
vlo/branches/vlo-3.0/vlo-web-app/pom.xml
r4323 r4326 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <project xmlns="http://maven.apache.org/POM/4.0.0" 3 4 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 5 5 6 <modelVersion>4.0.0</modelVersion> 7 <groupId>eu.clarin.cmdi</groupId> 8 <artifactId>vlo-web-app</artifactId> 9 <packaging>war</packaging> 10 <version>1.0-SNAPSHOT</version> 11 <!-- TODO project name --> 12 <name>VLO Web Application</name> 13 <description></description> 6 <parent> 7 <groupId>eu.clarin.cmdi</groupId> 8 <artifactId>vlo</artifactId> 9 <version>3.0-SNAPSHOT</version> 10 </parent> 11 12 <modelVersion>4.0.0</modelVersion> 13 <groupId>eu.clarin.cmdi</groupId> 14 <artifactId>vlo-web-app</artifactId> 15 <packaging>war</packaging> 16 <version>1.0-SNAPSHOT</version> 17 <!-- TODO project name --> 18 <name>VLO Web Application</name> 19 <description></description> 14 20 15 <properties> 16 <wicket.version>6.12.0</wicket.version> 17 <jetty.version>7.6.13.v20130916</jetty.version> 18 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 19 </properties> 20 <dependencies> 21 <!-- WICKET DEPENDENCIES --> 22 <dependency> 23 <groupId>org.apache.wicket</groupId> 24 <artifactId>wicket-extensions</artifactId> 25 <version>${wicket.version}</version> 26 </dependency> 21 <properties> 22 <wicket.version>6.12.0</wicket.version> 23 <jetty.version>7.6.13.v20130916</jetty.version> 24 </properties> 25 <dependencies> 26 <!-- WICKET DEPENDENCIES --> 27 <dependency> 28 <groupId>org.apache.wicket</groupId> 29 <artifactId>wicket-extensions</artifactId> 30 <version>${wicket.version}</version> 31 </dependency> 27 32 28 29 30 31 32 <version>1.6.4</version>33 33 <!-- LOGGING DEPENDENCIES - LOG4J --> 34 <dependency> 35 <groupId>org.slf4j</groupId> 36 <artifactId>slf4j-log4j12</artifactId> 37 <version>${slf4j.version}</version> 38 </dependency> 34 39 35 <!-- JUNIT DEPENDENCY FOR TESTING --> 36 <dependency> 37 <groupId>junit</groupId> 38 <artifactId>junit</artifactId> 39 <version>4.11</version> 40 <scope>test</scope> 41 </dependency> 40 <!-- JETTY DEPENDENCIES FOR TESTING --> 41 <dependency> 42 <groupId>org.eclipse.jetty.aggregate</groupId> 43 <artifactId>jetty-all-server</artifactId> 44 <version>${jetty.version}</version> 45 <scope>provided</scope> 46 </dependency> 47 </dependencies> 48 <build> 49 <resources> 50 <resource> 51 <filtering>false</filtering> 52 <directory>src/main/resources</directory> 53 </resource> 54 <resource> 55 <filtering>false</filtering> 56 <directory>src/main/java</directory> 57 <includes> 58 <include>**</include> 59 </includes> 60 <excludes> 61 <exclude>**/*.java</exclude> 62 </excludes> 63 </resource> 64 </resources> 65 <testResources> 66 <testResource> 67 <filtering>false</filtering> 68 <directory>src/test/resources</directory> 69 </testResource> 70 <testResource> 71 <filtering>false</filtering> 72 <directory>src/test/java</directory> 73 <includes> 74 <include>**</include> 75 </includes> 76 <excludes> 77 <exclude>**/*.java</exclude> 78 </excludes> 79 </testResource> 80 </testResources> 81 <plugins> 82 <plugin> 83 <inherited>true</inherited> 84 <groupId>org.apache.maven.plugins</groupId> 85 <artifactId>maven-compiler-plugin</artifactId> 86 <version>2.5.1</version> 87 <configuration> 88 <source>1.6</source> 89 <target>1.6</target> 90 <encoding>UTF-8</encoding> 91 <showWarnings>true</showWarnings> 92 <showDeprecation>true</showDeprecation> 93 </configuration> 94 </plugin> 95 <plugin> 96 <groupId>org.mortbay.jetty</groupId> 97 <artifactId>jetty-maven-plugin</artifactId> 98 <version>${jetty.version}</version> 99 <configuration> 100 <connectors> 101 <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> 102 <port>8080</port> 103 <maxIdleTime>3600000</maxIdleTime> 104 </connector> 105 <connector implementation="org.eclipse.jetty.server.ssl.SslSocketConnector"> 106 <port>8443</port> 107 <maxIdleTime>3600000</maxIdleTime> 108 <keystore>${project.build.directory}/test-classes/keystore</keystore> 109 <password>wicket</password> 110 <keyPassword>wicket</keyPassword> 111 </connector> 112 </connectors> 113 </configuration> 114 </plugin> 115 <plugin> 116 <artifactId>maven-assembly-plugin</artifactId> 117 <version>2.3</version> 118 <configuration> 119 <descriptors> 120 <descriptor>src/main/assembly/buildwar.xml</descriptor> 121 </descriptors> 122 </configuration> 123 <executions> 124 <execution> 125 <id>make-assemblyJ</id> 126 <phase>package</phase> 127 <goals> 128 <goal>single</goal> 129 </goals> 130 </execution> 131 </executions> 132 </plugin> 133 </plugins> 134 </build> 42 135 43 <!-- JETTY DEPENDENCIES FOR TESTING --> 44 <dependency> 45 <groupId>org.eclipse.jetty.aggregate</groupId> 46 <artifactId>jetty-all-server</artifactId> 47 <version>${jetty.version}</version> 48 <scope>provided</scope> 49 </dependency> 50 </dependencies> 51 <build> 52 <resources> 53 <resource> 54 <filtering>false</filtering> 55 <directory>src/main/resources</directory> 56 </resource> 57 <resource> 58 <filtering>false</filtering> 59 <directory>src/main/java</directory> 60 <includes> 61 <include>**</include> 62 </includes> 63 <excludes> 64 <exclude>**/*.java</exclude> 65 </excludes> 66 </resource> 67 </resources> 68 <testResources> 69 <testResource> 70 <filtering>false</filtering> 71 <directory>src/test/resources</directory> 72 </testResource> 73 <testResource> 74 <filtering>false</filtering> 75 <directory>src/test/java</directory> 76 <includes> 77 <include>**</include> 78 </includes> 79 <excludes> 80 <exclude>**/*.java</exclude> 81 </excludes> 82 </testResource> 83 </testResources> 84 <plugins> 85 <plugin> 86 <inherited>true</inherited> 87 <groupId>org.apache.maven.plugins</groupId> 88 <artifactId>maven-compiler-plugin</artifactId> 89 <version>2.5.1</version> 90 <configuration> 91 <source>1.6</source> 92 <target>1.6</target> 93 <encoding>UTF-8</encoding> 94 <showWarnings>true</showWarnings> 95 <showDeprecation>true</showDeprecation> 96 </configuration> 97 </plugin> 98 <plugin> 99 <groupId>org.mortbay.jetty</groupId> 100 <artifactId>jetty-maven-plugin</artifactId> 101 <version>${jetty.version}</version> 102 <configuration> 103 <connectors> 104 <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> 105 <port>8080</port> 106 <maxIdleTime>3600000</maxIdleTime> 107 </connector> 108 <connector implementation="org.eclipse.jetty.server.ssl.SslSocketConnector"> 109 <port>8443</port> 110 <maxIdleTime>3600000</maxIdleTime> 111 <keystore>${project.build.directory}/test-classes/keystore</keystore> 112 <password>wicket</password> 113 <keyPassword>wicket</keyPassword> 114 </connector> 115 </connectors> 116 </configuration> 117 </plugin> 118 </plugins> 119 </build> 120 121 <repositories> 122 <repository> 123 <id>Apache Nexus</id> 124 <url>https://repository.apache.org/content/repositories/snapshots/</url> 125 <releases> 126 <enabled>false</enabled> 127 </releases> 128 <snapshots> 129 <enabled>true</enabled> 130 </snapshots> 131 </repository> 132 </repositories> 133 </project> 136 <repositories> 137 <repository> 138 <id>Apache Nexus</id> 139 <url>https://repository.apache.org/content/repositories/snapshots/</url> 140 <releases> 141 <enabled>false</enabled> 142 </releases> 143 <snapshots> 144 <enabled>true</enabled> 145 </snapshots> 146 </repository> 147 </repositories> 148 </project>
Note: See TracChangeset
for help on using the changeset viewer.