Repository: roller Updated Branches: refs/heads/java10 [created] 8192321fd
Beginning of a CDI based weblogger provider. Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/b7f4daac Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/b7f4daac Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/b7f4daac Branch: refs/heads/java10 Commit: b7f4daac1fbfc45cd282399c652158769b5d0dba Parents: 40547d2 Author: Dave Johnson <[email protected]> Authored: Sun Sep 2 15:47:54 2018 -0400 Committer: Dave Johnson <[email protected]> Committed: Sun Sep 2 15:47:54 2018 -0400 ---------------------------------------------------------------------- app/pom.xml | 33 ++++++++++++++---- .../business/CdiWebloggerProvider.java | 36 ++++++++++++++++++++ pom.xml | 6 ++-- 3 files changed, 66 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/b7f4daac/app/pom.xml ---------------------------------------------------------------------- diff --git a/app/pom.xml b/app/pom.xml index 44b7882..843da76 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -33,6 +33,13 @@ limitations under the License. <packaging>war</packaging> <properties> + + <servlet.version>3.0.1</servlet.version> + <jsp-api.version>2.2</jsp-api.version> + <java-activation.version>1.2.0</java-activation.version> + <java-mail.version>1.4.7</java-mail.version> + <jstl.version>1.2</jstl.version> + <angular.version>1.2.29</angular.version> <ant.version>1.10.1</ant.version> <commons-validator.version>1.6</commons-validator.version> @@ -40,10 +47,7 @@ limitations under the License. <commons-httpclient.version>3.1</commons-httpclient.version> <commons-codec.version>1.10</commons-codec.version> <eclipse-link.version>2.5.2</eclipse-link.version> - <guice.version>4.1.0</guice.version> - <java-mail.version>1.4.7</java-mail.version> - <jsp-api.version>2.2</jsp-api.version> - <jstl.version>1.2</jstl.version> + <guice.version>4.2.0</guice.version> <log4j.version>1.2.17</log4j.version> <log4j2.version>2.8.2</log4j2.version> <lucene.version>4.10.4</lucene.version> @@ -52,7 +56,6 @@ limitations under the License. <maven-surefire.version>2.17</maven-surefire.version> <maven-antrun.version>1.0b3</maven-antrun.version> <rome.version>1.7.4</rome.version> - <servlet.version>3.0.1</servlet.version> <slf4j.version>1.7.25</slf4j.version> <spring.version>4.1.4.RELEASE</spring.version> <spring.security.version>3.2.5.RELEASE</spring.security.version> @@ -62,11 +65,11 @@ limitations under the License. <ws-commons-util.version>1.0.2</ws-commons-util.version> <xml-security.version>1.3.0</xml-security.version> <xmlrpc-version>3.1.3</xmlrpc-version> + </properties> <dependencies> - <!-- Java EE deps --> <dependency> @@ -102,6 +105,24 @@ limitations under the License. </exclusions> </dependency> + <dependency> + <groupId>com.sun.activation</groupId> + <artifactId>javax.activation</artifactId> + <version>${java-activation.version}</version> + </dependency> + + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.0</version> + </dependency> + + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>2.0</version> + </dependency> + <!-- Eclipselink JPA is the default JPA implementation used by Roller, comment out this dependency and uncomment Hibernate's to use that stack instead. http://git-wip-us.apache.org/repos/asf/roller/blob/b7f4daac/app/src/main/java/org/apache/roller/weblogger/business/CdiWebloggerProvider.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/business/CdiWebloggerProvider.java b/app/src/main/java/org/apache/roller/weblogger/business/CdiWebloggerProvider.java new file mode 100644 index 0000000..e879ff5 --- /dev/null +++ b/app/src/main/java/org/apache/roller/weblogger/business/CdiWebloggerProvider.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. 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. For additional information regarding + * copyright in this work, please see the NOTICE file in the top level + * directory of this distribution. + */ + +package org.apache.roller.weblogger.business; + +import org.apache.roller.weblogger.business.BootstrapException; +import org.apache.roller.weblogger.business.Weblogger; +import org.apache.roller.weblogger.business.WebloggerProvider; + + +public class CdiWebloggerProvider implements WebloggerProvider { + @Override + public void bootstrap() throws BootstrapException { + + } + + @Override + public Weblogger getWeblogger() { + return null; + } +} http://git-wip-us.apache.org/repos/asf/roller/blob/b7f4daac/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4e3d92f..d2eb5d5 100644 --- a/pom.xml +++ b/pom.xml @@ -61,10 +61,10 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> + <version>3.8.0</version> <configuration> - <source>1.7</source> - <target>1.7</target> + <source>10</source> + <target>10</target> <fork>true</fork> <encoding>${project.build.sourceEncoding}</encoding> </configuration>
