Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev 4.15 #12

Merged
merged 26 commits into from
Jun 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@
"extends": "eslint-config-ct-prodeng",
"plugins": [
"vue"
],
"ignorePatterns": [
"src/main/js/bundles/hopscotch"
]
}
8 changes: 8 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"recommendations": [
"dbaeumer.vscode-eslint",
"Vue.volar",
"Esri.arcgis-jsapi-snippets",
"ctjdr.vscode-apprt-bundles"
]
}
15 changes: 15 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:9090",
"webRoot": "${workspaceFolder}/src/main"
}
]
}
44 changes: 33 additions & 11 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,46 @@
"version": "2.0.0",
"tasks": [
{
"label": "Run Jetty Server",
"label": "Initialize",
"detail": "Initialize map.apps for Developers project",
"type": "shell",
"command": "mvn clean jetty:run -Pwatch-all",
"group": {
"kind": "build",
"isDefault": true
}
"command": "mvn initialize",
"group": "build"
},
{
"label": "Run stand-alone Jetty Server",
"label": "Run",
"detail": "Run map.apps for Developers development server",
"type": "shell",
"command": "mvn clean jetty:run -P'watch-all,include-mapapps-deps'",
"group": "build"
"command": "mvn",
"args": ["compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'", "-Pinclude-mapapps-deps"],
"group": "build",
"isBackground": true
},
{
"label": "Run (Remote project mode)",
"detail": "Run map.apps for Developers development server in 'remote project' mode",
"type": "shell",
"command": "mvn",
"args": ["compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'"],
"group": "build",
"isBackground": true
},
{
"label": "Compress",
"detail": "Prepare bundles and apps for deployment on a map.apps instance",
"type": "shell",
"command": "mvn",
"args": ["install", "-Pcompress"],
"group": "build",
"presentation": {
"reveal": "always",
"panel": "dedicated"
}
},
{
"label": "Install",
"label": "Clean",
"type": "shell",
"command": "mvn clean install -Pcompress",
"command": "mvn clean",
"group": "build"
}
]
Expand Down
124 changes: 0 additions & 124 deletions Jenkinsfile

This file was deleted.

5 changes: 3 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,15 @@
APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright {yyyy} {name of copyright owner}

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -199,3 +199,4 @@
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.

24 changes: 4 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,9 @@ https://github.com/linkedin/hopscotch

## Sample App

https://demos.conterra.de/mapapps/resources/apps/downloads_intro_4x/index.html
- map.apps 4.15.0
- All resources from `map.apps-VERSION/sdk/m2-repository` need to be copied manually to your local Maven repository (e.g. `%UserProfile%/.m2/repository` for Windows, `~/.m2/repository` for MacOS).

## Installation Guide
## More Information

**Requirement: map.apps 4**

[dn_intro Documentation](https://github.com/conterra/mapapps-intro/tree/master/src/main/js/bundles/dn_intro)

## Development Guide

### Define the mapapps remote base

Before you can run the project you have to define the mapapps.remote.base property in the pom.xml-file:
`<mapapps.remote.base>http://%YOURSERVER%/ct-mapapps-webapp-%VERSION%</mapapps.remote.base>`

### Other methods to to define the mapapps.remote.base property.

1. Goal parameters
`mvn install -Dmapapps.remote.base=http://%YOURSERVER%/ct-mapapps-webapp-%VERSION%`

2. Build properties Change the mapapps.remote.base in the build.properties file and run:
`mvn install -Denv=dev -Dlocal.configfile=%ABSOLUTEPATHTOPROJECTROOT%/build.properties`
The project is always based on the latest version of the [mapapps-4-developers Project](https://github.com/conterra/mapapps-4-developers).
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
✅ Tested for map.apps 4.13.1 / Linie 4
✅ Tested for map.apps 4.15.0 / Linie 4

#### Release Notes
- SNAPSHOT-Release
4 changes: 2 additions & 2 deletions build.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2021 con terra GmbH (info@conterra.de)
# Copyright (C) 2023 con terra GmbH (info@conterra.de)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -15,4 +15,4 @@
#

# URL to the remote map.apps instance
mapapps.remote.base=http://%YOURSERVER%/ct-mapapps-webapp-%VERSION%
# mapapps.remote.base=http://%YOURSERVER%/ct-mapapps-webapp-%VERSION%
Loading