Skip to content

Commit

Permalink
1.0.3.Final release with major package restructuring.
Browse files Browse the repository at this point in the history
  • Loading branch information
@rakeshk15
rakeshk15 committed Nov 9, 2016
1 parent 7391bd5 commit 3713f1e
Show file tree
Hide file tree
Showing 50 changed files with 155 additions and 164 deletions.
33 changes: 12 additions & 21 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,16 @@
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.adeptj</groupId>
<artifactId>adeptj-modularweb-runtime</artifactId>
<version>1.0.3-SNAPSHOT</version>
<parent>
<groupId>com.adeptj</groupId>
<artifactId>adeptj-parent</artifactId>
<version>1.0.0.Final</version>
</parent>
<artifactId>adeptj-core</artifactId>
<version>1.0.3.Final</version>
<packaging>jar</packaging>
<name>AdeptJ ModularWeb Runtime</name>
<description>Provision AdeptJ ModularWeb Runtime</description>
<name>AdeptJ Core</name>
<description>Provision AdeptJ Core</description>
<url>http://www.adeptj.com</url>
<inceptionYear>2016</inceptionYear>

Expand Down Expand Up @@ -142,12 +146,11 @@
</scm>

<build>
<finalName>adeptj-runtime-${project.version}</finalName>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler.plugin.version}</version>
<configuration>
<compilerArgument>-parameters</compilerArgument>
<source>${jdk.version}</source>
Expand All @@ -173,7 +176,7 @@
</artifactSet>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.adeptj.modularweb.runtime.core.Main</mainClass>
<mainClass>com.adeptj.core.initializer.Main</mainClass>
</transformer>
</transformers>
</configuration>
Expand Down Expand Up @@ -211,6 +214,7 @@
</plugin>

</plugins>

</build>

<dependencies>
Expand Down Expand Up @@ -252,19 +256,16 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-api.version}</version>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback-core.version}</version>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback-classic.version}</version>
</dependency>

<dependency>
Expand All @@ -276,33 +277,28 @@
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
<version>${typesafe.config.version}</version>
</dependency>

<!-- Thymeleaf Dependencies -->

<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.21.0-GA</version>
</dependency>

<dependency>
<groupId>org.attoparser</groupId>
<artifactId>attoparser</artifactId>
<version>2.0.1.RELEASE</version>
</dependency>

<dependency>
<groupId>org.unbescape</groupId>
<artifactId>unbescape</artifactId>
<version>1.1.4.RELEASE</version>
</dependency>

<dependency>
<groupId>ognl</groupId>
<artifactId>ognl</artifactId>
<version>3.1.12</version>
<exclusions>
<exclusion>
<groupId>javassist</groupId>
Expand All @@ -314,7 +310,6 @@
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId>
<version>3.0.2.RELEASE</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand All @@ -340,28 +335,24 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>${org.json.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>io.fastjson</groupId>
<artifactId>boon</artifactId>
<version>${boon-json.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons-fileupload.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
<scope>provided</scope>
</dependency>

Expand Down
14 changes: 7 additions & 7 deletions ...tj/modularweb/runtime/config/Configs.java → .../java/com/adeptj/core/config/Configs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
# #
###############################################################################
*/
package com.adeptj.modularweb.runtime.config;
package com.adeptj.core.config;

import static com.adeptj.modularweb.runtime.common.Constants.COMMON_CONF_SECTION;
import static com.adeptj.modularweb.runtime.common.Constants.FELIX_CONF_SECTION;
import static com.adeptj.modularweb.runtime.common.Constants.MAIN_CONF_SECTION;
import static com.adeptj.modularweb.runtime.common.Constants.PROVISIONING_FILE;
import static com.adeptj.modularweb.runtime.common.Constants.THYMELEAF_CONF_SECTION;
import static com.adeptj.modularweb.runtime.common.Constants.UNDERTOW_CONF_SECTION;
import static com.adeptj.core.util.Constants.COMMON_CONF_SECTION;
import static com.adeptj.core.util.Constants.FELIX_CONF_SECTION;
import static com.adeptj.core.util.Constants.MAIN_CONF_SECTION;
import static com.adeptj.core.util.Constants.PROVISIONING_FILE;
import static com.adeptj.core.util.Constants.THYMELEAF_CONF_SECTION;
import static com.adeptj.core.util.Constants.UNDERTOW_CONF_SECTION;

import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
Expand Down
14 changes: 7 additions & 7 deletions .../adeptj/modularweb/runtime/core/Main.java → ...ava/com/adeptj/core/initializer/Main.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@
# #
###############################################################################
*/
package com.adeptj.modularweb.runtime.core;
package com.adeptj.core.initializer;

import java.util.HashMap;
import java.util.Map;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.adeptj.modularweb.runtime.common.BundleContextAware;
import com.adeptj.modularweb.runtime.common.Constants;
import com.adeptj.modularweb.runtime.common.TimeUnits;
import com.adeptj.modularweb.runtime.logging.LogbackProvisioner;
import com.adeptj.modularweb.runtime.osgi.FrameworkProvisioner;
import com.adeptj.modularweb.runtime.undertow.UndertowProvisioner;
import com.adeptj.core.logging.LogbackProvisioner;
import com.adeptj.core.osgi.FrameworkProvisioner;
import com.adeptj.core.undertow.UndertowProvisioner;
import com.adeptj.core.util.BundleContextAware;
import com.adeptj.core.util.Constants;
import com.adeptj.core.util.TimeUnits;

/**
* Entry point for initializing the AdeptJ Runtime.
Expand Down
2 changes: 1 addition & 1 deletion ...dularweb/runtime/core/StartupHandler.java → ...eptj/core/initializer/StartupHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# #
###############################################################################
*/
package com.adeptj.modularweb.runtime.core;
package com.adeptj.core.initializer;

import javax.servlet.ServletContext;
import javax.servlet.ServletException;
Expand Down
6 changes: 3 additions & 3 deletions ...b/runtime/logging/LogbackProvisioner.java → ...eptj/core/logging/LogbackProvisioner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# #
###############################################################################
*/
package com.adeptj.modularweb.runtime.logging;
package com.adeptj.core.logging;

import static ch.qos.logback.classic.Level.toLevel;

Expand All @@ -26,8 +26,8 @@

import org.slf4j.LoggerFactory;

import com.adeptj.modularweb.runtime.common.TimeUnits;
import com.adeptj.modularweb.runtime.config.Configs;
import com.adeptj.core.config.Configs;
import com.adeptj.core.util.TimeUnits;
import com.typesafe.config.Config;

import ch.qos.logback.classic.Level;
Expand Down
2 changes: 1 addition & 1 deletion ...i/BridgeHttpSessionAttributeListener.java → ...i/BridgeHttpSessionAttributeListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# #
###############################################################################
*/
package com.adeptj.modularweb.runtime.osgi;
package com.adeptj.core.osgi;

import javax.servlet.http.HttpSessionAttributeListener;
import javax.servlet.http.HttpSessionBindingEvent;
Expand Down
2 changes: 1 addition & 1 deletion ...ime/osgi/BridgeHttpSessionIdListener.java → ...ore/osgi/BridgeHttpSessionIdListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# #
###############################################################################
*/
package com.adeptj.modularweb.runtime.osgi;
package com.adeptj.core.osgi;

import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionIdListener;
Expand Down
2 changes: 1 addition & 1 deletion ...ntime/osgi/BridgeHttpSessionListener.java → .../core/osgi/BridgeHttpSessionListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# #
###############################################################################
*/
package com.adeptj.modularweb.runtime.osgi;
package com.adeptj.core.osgi;

import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
Expand Down
2 changes: 1 addition & 1 deletion ...ridgeServletContextAttributeListener.java → ...ridgeServletContextAttributeListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# #
###############################################################################
*/
package com.adeptj.modularweb.runtime.osgi;
package com.adeptj.core.osgi;

import javax.servlet.ServletContextAttributeEvent;
import javax.servlet.ServletContextAttributeListener;
Expand Down
6 changes: 3 additions & 3 deletions ...arweb/runtime/osgi/BundleProvisioner.java → ...m/adeptj/core/osgi/BundleProvisioner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
# #
###############################################################################
*/
package com.adeptj.modularweb.runtime.osgi;
package com.adeptj.core.osgi;

import static com.adeptj.modularweb.runtime.common.Constants.BUNDLES_ROOT_DIR_KEY;
import static com.adeptj.core.util.Constants.BUNDLES_ROOT_DIR_KEY;

import java.io.IOException;
import java.net.JarURLConnection;
Expand All @@ -37,7 +37,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.adeptj.modularweb.runtime.common.ServletContextAware;
import com.adeptj.core.util.ServletContextAware;

/**
* BundleProvisioner that handles the installation/activation of required bundles after the system bundle is up and running.
Expand Down
4 changes: 2 additions & 2 deletions ...untime/osgi/DispatcherServletTracker.java → ...j/core/osgi/DispatcherServletTracker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# #
###############################################################################
*/
package com.adeptj.modularweb.runtime.osgi;
package com.adeptj.core.osgi;

import javax.servlet.http.HttpServlet;

Expand All @@ -28,7 +28,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.adeptj.modularweb.runtime.common.OSGiUtils;
import com.adeptj.core.util.OSGiUtils;

/**
* OSGi ServiceTracker for FELIX DispatcherServlet.
Expand Down
4 changes: 2 additions & 2 deletions ...osgi/DispatcherServletTrackerSupport.java → ...osgi/DispatcherServletTrackerSupport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
# #
###############################################################################
*/
package com.adeptj.modularweb.runtime.osgi;
package com.adeptj.core.osgi;

import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServlet;

import org.osgi.framework.BundleContext;

import com.adeptj.modularweb.runtime.common.BundleContextAware;
import com.adeptj.core.util.BundleContextAware;

/**
* Support for DispatcherServletTracker.
Expand Down
4 changes: 2 additions & 2 deletions .../runtime/osgi/EventDispatcherTracker.java → ...ptj/core/osgi/EventDispatcherTracker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# #
###############################################################################
*/
package com.adeptj.modularweb.runtime.osgi;
package com.adeptj.core.osgi;

import java.util.EventListener;

Expand All @@ -32,7 +32,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.adeptj.modularweb.runtime.common.OSGiUtils;
import com.adeptj.core.util.OSGiUtils;

/**
* This class is a modified version of FELIX EventDispatcherTracker and rectify the Invalid BundleContext issue.
Expand Down
2 changes: 1 addition & 1 deletion ...e/osgi/EventDispatcherTrackerSupport.java → ...e/osgi/EventDispatcherTrackerSupport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# #
###############################################################################
*/
package com.adeptj.modularweb.runtime.osgi;
package com.adeptj.core.osgi;

import org.osgi.framework.BundleContext;
import org.slf4j.LoggerFactory;
Expand Down
16 changes: 8 additions & 8 deletions ...eb/runtime/osgi/FrameworkProvisioner.java → ...deptj/core/osgi/FrameworkProvisioner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# #
###############################################################################
*/
package com.adeptj.modularweb.runtime.osgi;
package com.adeptj.core.osgi;

import java.io.IOException;
import java.util.Arrays;
Expand All @@ -38,13 +38,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.adeptj.modularweb.runtime.common.BundleContextAware;
import com.adeptj.modularweb.runtime.common.TimeUnits;
import com.adeptj.modularweb.runtime.config.Configs;
import com.adeptj.modularweb.runtime.servlet.AdminDashboardServlet;
import com.adeptj.modularweb.runtime.servlet.AdminLoginServlet;
import com.adeptj.modularweb.runtime.servlet.OSGiGenericErrorSevlet;
import com.adeptj.modularweb.runtime.servlet.ProxyDispatcherServlet;
import com.adeptj.core.config.Configs;
import com.adeptj.core.servlet.AdminDashboardServlet;
import com.adeptj.core.servlet.AdminLoginServlet;
import com.adeptj.core.servlet.OSGiGenericErrorSevlet;
import com.adeptj.core.servlet.ProxyDispatcherServlet;
import com.adeptj.core.util.BundleContextAware;
import com.adeptj.core.util.TimeUnits;
import com.typesafe.config.Config;

/**
Expand Down
6 changes: 3 additions & 3 deletions ...runtime/osgi/FrameworkRestartHandler.java → ...tj/core/osgi/FrameworkRestartHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# #
###############################################################################
*/
package com.adeptj.modularweb.runtime.osgi;
package com.adeptj.core.osgi;

import javax.servlet.ServletContext;

Expand All @@ -27,8 +27,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.adeptj.modularweb.runtime.common.BundleContextAware;
import com.adeptj.modularweb.runtime.common.ServletContextAware;
import com.adeptj.core.util.BundleContextAware;
import com.adeptj.core.util.ServletContextAware;

/**
* OSGi FrameworkListener.
Expand Down
Loading

0 comments on commit 3713f1e

Please sign in to comment.