Skip to content

Resolve Issue #11 #12

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

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@

# Maven
log/
target/
target/
/temp/
2 changes: 1 addition & 1 deletion .mvn/wrapper/MavenWrapperDownloader.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

public class MavenWrapperDownloader {

private static final String WRAPPER_VERSION = "0.5.5";
private static final String WRAPPER_VERSION = "0.5.6";
/**
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
*/
Expand Down
Binary file modified .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
59 changes: 55 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,55 @@
# InFactory-1.1 is an upgrade version from InFactory to support IndoorGML 1.1.
The main difference of IndoorGML 1.1 from the previous one (v.1.0.3) is the inclusion of "level" property of CellSpace.
Since "level" property is an optional and cardinatity is [0..*], no conflict takes place with IndoorGML 1.0.3.
The remaining part is exactly identical with the previous InFactory (https://github.com/STEMLab/InFactory)
# InFactory-1.1
InFactory-1.1 is for creating & editing OGC IndoorGML 1.1 formatted data. This project is an upgrade version from [InFactory](https://github.com/STEMLab/InFactory) to support IndoorGML 1.1.

`Note that the main difference of IndoorGML 1.1 from the previous one (v.1.0.3) is the inclusion of the "level" property of CellSpace. Since "level" property is an optional and cardinality is [0..*], no conflict occurs with IndoorGML 1.0.3.`

## Getting Started

### Prerequisites
1) OS: regardless of OS
2) Maven: over 3.5 version. You need to install Maven.
* This project supports the Maven wrapper. If you do not want to install Maven, follow `With Maven wrapper` section.
3) JDK: over 11 version.

### Installing and Running
#### With installed Maven
1) Project build `mvn clean install`
2) Spring server execute `mvn jetty:run`
3) We recommend using the other port number(e.g., 9797) with parameter
`mvn jetty:run "-Djetty.port=9797"`

#### With Maven wrapper
1) Project build `./mvnw clean install`
2) Spring server execute `./mvnw jetty:run`
3) We recommend using the other port number(e.g., 9797) with parameter
`./mvnw jetty:run "-Djetty.port=9797"`

## Built With
* [Maven](https://maven.apache.org/) - Dependency Management
* [Spring Framework 5.0](https://spring.io/) - Java web framework

## How to make HTTP requests
It is explained at the [Wiki](https://github.com/STEMLab/InFactory/wiki).

## Developer
* Hyemi Jeong - IndoorGML CRUD DAO developer
* Hyung-Gyu Ryoo - IndoorGML Restful API developer
* **Do-Hoon Kang - InFactory Server developer and maintainer, dhkang@pnu.edu**
* **Taehoon Kim - InFactory Server developer and maintainer, taehoon.kim@pnu.edu**

## Contributing
Please refer to each project's style guidelines and guidelines for submitting patches and additions. In general, we follow the **_"Fork & Pull"_** Git workflow.

1) Fork the repo on GitHub.
2) Clone the project to your own machine.
3) Commit changes to your own branch.
4) Push your work back up to your fork.
5) Submit a Pull request so that we can review your changes.

`NOTE: Be sure to merge the latest from "upstream" before making a pull request!`

## License
This project is under the MIT License - see the [LICENSE](https://github.com/STEMLab/InFactory-1.1/blob/master/LICENSE)

## More Information
More information can check at [Wiki](https://github.com/STEMLab/InFactory/wiki).
67 changes: 0 additions & 67 deletions database/bin/pom.xml

This file was deleted.

Binary file removed database/bin/src/main/java/database/Connector.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
67 changes: 0 additions & 67 deletions database/pom.xml

This file was deleted.

166 changes: 0 additions & 166 deletions database/src/main/java/database/Connector.java

This file was deleted.

Loading