Skip to content

Antti Väyrynen / Moya

Go to a project
Commit e5e0b74b by Tuukka Kivilahti
Options

removed melody, added MoyaNG to urls

1 parent 353dd98c
Inline Side-by-side
Showing with 27 additions and 65 deletions
code/moya-angular-common/src/index.ts
...@@ -6,7 +6,7 @@ export * from './moya-rest'; ...@@ -6,7 +6,7 @@ export * from './moya-rest';
const MODULES = [ const MODULES = [
MoyaRestModule MoyaRestModule
] ];
@NgModule({ @NgModule({
imports: [MoyaRestModule.forRoot()], imports: [MoyaRestModule.forRoot()],
......
code/moya-angular/package.json
...@@ -3,7 +3,14 @@ ...@@ -3,7 +3,14 @@
"version": "0.0.0", "version": "0.0.0",
"license": "UNLICENSED", "license": "UNLICENSED",
"angular-cli": {}, "angular-cli": {},
"scripts": {}, "scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
},
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^4.1.2", "@angular/animations": "^4.1.2",
......
code/moya-angular/pom.xml
...@@ -61,14 +61,6 @@ ...@@ -61,14 +61,6 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<dependencies>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans-client</artifactId>
<version>1.2-SNAPSHOT</version>
</dependency>
</dependencies>
<parent> <parent>
<groupId>fi.codecrew.moya</groupId> <groupId>fi.codecrew.moya</groupId>
<artifactId>moya-parent</artifactId> <artifactId>moya-parent</artifactId>
......
code/moya-angular/src/app/app.component.html
<router-outlet></router-outlet> <router-outlet></router-outlet>
<app-test ([counter])="counter"> </app-test>
{{counter}}
<a routerLink="/test" routerLinkActive="active">test</a> <a routerLink="/test" routerLinkActive="active">test</a>
<a routerLink="/vip/viplist" routerLinkActive="active">viplist</a> <a routerLink="/vip/viplist" routerLinkActive="active">viplist</a>
code/moya-angular/src/index.html
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>MoyaAngular</title> <title>MoyaAngular</title>
<base href="/"> <base href="/MoyaNG/">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico"> <link rel="icon" type="image/x-icon" href="favicon.ico">
</head> </head>
<body> <body>
<app-root>Loading...</app-root> <app-root>Welcome to new MOYA</app-root>
</body> </body>
</html> </html>
code/moya-ear/pom.xml
...@@ -16,16 +16,7 @@ ...@@ -16,16 +16,7 @@
<version>7</version> <version>7</version>
<defaultLibBundleDir>lib</defaultLibBundleDir> <defaultLibBundleDir>lib</defaultLibBundleDir>
<modules> <modules>
<jarModule>
<groupId>net.bull.javamelody</groupId>
<artifactId>javamelody-core</artifactId>
<includeInApplicationXml>true</includeInApplicationXml>
</jarModule>
<jarModule>
<groupId>org.jrobin</groupId>
<artifactId>jrobin</artifactId>
<includeInApplicationXml>true</includeInApplicationXml>
</jarModule>
<ejbModule> <ejbModule>
<groupId>fi.codecrew.moya</groupId> <groupId>fi.codecrew.moya</groupId>
...@@ -43,6 +34,11 @@ ...@@ -43,6 +34,11 @@
</webModule> </webModule>
<webModule> <webModule>
<groupId>fi.codecrew.moya</groupId> <groupId>fi.codecrew.moya</groupId>
<artifactId>moya-angular</artifactId>
<contextRoot>/MoyaNG</contextRoot>
</webModule>
<webModule>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-terminal-web</artifactId> <artifactId>moya-terminal-web</artifactId>
<contextRoot>/terminal</contextRoot> <contextRoot>/terminal</contextRoot>
</webModule> </webModule>
...@@ -53,11 +49,7 @@ ...@@ -53,11 +49,7 @@
</build> </build>
<dependencies> <dependencies>
<dependency>
<groupId>net.bull.javamelody</groupId>
<artifactId>javamelody-core</artifactId>
<version>${javamelody.version}</version>
</dependency>
<dependency> <dependency>
<groupId>fi.codecrew.moya</groupId> <groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans</artifactId> <artifactId>moya-beans</artifactId>
...@@ -79,6 +71,13 @@ ...@@ -79,6 +71,13 @@
<dependency> <dependency>
<groupId>fi.codecrew.moya</groupId> <groupId>fi.codecrew.moya</groupId>
<artifactId>moya-angular</artifactId>
<version>1.2-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-terminal-web</artifactId> <artifactId>moya-terminal-web</artifactId>
<version>1.2-SNAPSHOT</version> <version>1.2-SNAPSHOT</version>
<type>war</type> <type>war</type>
......
code/moya-parent/pom.xml
...@@ -44,12 +44,7 @@ ...@@ -44,12 +44,7 @@
<artifactId>sshd-core</artifactId> <artifactId>sshd-core</artifactId>
<version>0.14.0</version> <version>0.14.0</version>
</dependency> </dependency>
<dependency>
<!-- Java melody dependency -->
<groupId>org.jrobin</groupId>
<artifactId>jrobin</artifactId>
<version>1.5.9</version>
</dependency>
<dependency> <dependency>
<groupId>fi.iudex.pdfjet</groupId> <groupId>fi.iudex.pdfjet</groupId>
<artifactId>pdfjet</artifactId> <artifactId>pdfjet</artifactId>
......
code/moya-terminal-web/WebContent/WEB-INF/web.xml
...@@ -16,19 +16,6 @@ ...@@ -16,19 +16,6 @@
</session-config> </session-config>
<!-- Java melody monitoring -->
<filter>
<filter-name>javamelody</filter-name>
<filter-class>net.bull.javamelody.MonitoringFilter</filter-class>
<async-supported>true</async-supported>
</filter>
<filter-mapping>
<filter-name>javamelody</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
<listener-class>net.bull.javamelody.SessionListener</listener-class>
</listener>
<servlet> <servlet>
<servlet-name>Faces Servlet</servlet-name> <servlet-name>Faces Servlet</servlet-name>
......
code/moya-web/WebContent/WEB-INF/web.xml
...@@ -28,20 +28,7 @@ ...@@ -28,20 +28,7 @@
<param-name>javax.faces.PROJECT_STAGE</param-name> <param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value> <param-value>Development</param-value>
</context-param> </context-param>
<!-- Java melody monitoring -->
<filter>
<filter-name>javamelody</filter-name>
<filter-class>net.bull.javamelody.MonitoringFilter</filter-class>
<async-supported>true</async-supported>
</filter>
<filter-mapping>
<filter-name>javamelody</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
<listener-class>net.bull.javamelody.SessionListener</listener-class>
</listener>
<filter> <filter>
<display-name>PrimefacesFileupload</display-name> <display-name>PrimefacesFileupload</display-name>
......
code/pom.xml
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
<logback.version>1.2.3</logback.version> <logback.version>1.2.3</logback.version>
<testng.version>6.11</testng.version> <testng.version>6.11</testng.version>
<javamelody.version>1.65.0</javamelody.version>
<primefaces.version>6.0</primefaces.version> <primefaces.version>6.0</primefaces.version>
<primefaces.themeversion>1.0.10</primefaces.themeversion> <primefaces.themeversion>1.0.10</primefaces.themeversion>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!