Skip to content

Linnea Samila / Moya

Go to a project
Commit bd3b9a01 by Tuukka Kivilahti
Options

removed melody, added MoyaNG to urls

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