Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • infrastruktur/warppay-app
  • HoelShare/warppay-app
2 results
Show changes
Commits on Source (32)
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 491 deletions
.gitignore
View file @ a73494b9
......@@ -2,3 +2,6 @@ WarpDrinkApi/.settings/
WarpDrinkApi/.classpath
WarpDrinkApi/.project
WarpDrinkApi/target/
WarpDrinkApp/.idea/compiler.xml
WarpDrinkApp/.idea/
*.iml
WarpDrinkApi/pom.xml deleted 100644 → 0
View file @ f73a1684
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>ms.itsecteam</groupId>
<artifactId>warpdrink</artifactId>
<packaging>war</packaging>
<version>0.0.1-SNAPSHOT</version>
<name>warpdrink Maven Webapp</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
<version>1.19</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>5.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
<version>2.7.5</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>1.7.1</version>
</dependency>
<dependency>
<groupId>com.j256.ormlite</groupId>
<artifactId>ormlite-jdbc</artifactId>
<version>4.48</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.35</version>
</dependency>
</dependencies>
<build>
<finalName>warpdrink</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
WarpDrinkApi/src/main/java/ms/itsecteam/warpdrink/Database.java deleted 100644 → 0
View file @ f73a1684
package ms.itsecteam.warpdrink;
import java.sql.SQLException;
import com.j256.ormlite.jdbc.JdbcConnectionSource;
import com.j256.ormlite.support.ConnectionSource;
public class Database {
private static Database instance;
private ConnectionSource connectionSource;
private Database() {
try {
this.connectionSource = new JdbcConnectionSource("jdbc:mysql://localhost/dev","root","");
System.out.println(this.connectionSource);
System.out.println(this.connectionSource.isOpen());
} catch (SQLException e) {
e.printStackTrace();
}
}
public static Database getInstance() {
if (instance == null) {
instance = new Database();
}
return instance;
}
public ConnectionSource getConnectionSource() {
return connectionSource;
}
public void setConnectionSource(ConnectionSource connectionSource) {
this.connectionSource = connectionSource;
}
}
WarpDrinkApi/src/main/java/ms/itsecteam/warpdrink/Servlet.java deleted 100644 → 0
View file @ f73a1684
package ms.itsecteam.warpdrink;
import java.sql.SQLException;
import ms.itsecteam.warpdrink.objects.User;
public class Servlet extends com.sun.jersey.spi.container.servlet.ServletContainer{
/**
*
*/
private static final long serialVersionUID = 1L;
public Servlet() {
super();
Database.getInstance();
try {
UserDao.getInstance().saveUser(new User("Hans",3.0));
} catch (SQLException e) {
e.printStackTrace();
}
}
}
WarpDrinkApi/src/main/java/ms/itsecteam/warpdrink/UserDao.java deleted 100644 → 0
View file @ f73a1684
package ms.itsecteam.warpdrink;
import java.sql.SQLException;
import java.util.List;
import ms.itsecteam.warpdrink.objects.User;
import com.j256.ormlite.dao.BaseDaoImpl;
import com.j256.ormlite.dao.Dao;
import com.j256.ormlite.dao.DaoManager;
import com.j256.ormlite.support.ConnectionSource;
import com.j256.ormlite.table.TableUtils;
public class UserDao extends BaseDaoImpl<User, String>{
private static UserDao instance;
private ConnectionSource connectionSource;
private Dao<User, String> userDao;
private UserDao() throws SQLException {
super(User.class);
this.connectionSource = Database.getInstance().getConnectionSource();
TableUtils.createTableIfNotExists(this.connectionSource, User.class);
this.userDao = DaoManager.createDao(this.connectionSource, User.class);
}
public static UserDao getInstance() throws SQLException {
if (instance == null) {
instance = new UserDao();
}
return instance;
}
public void saveUser(User user) throws SQLException {
this.userDao.createOrUpdate(user);
}
public List<User> getAllUsers() throws SQLException {
return this.userDao.queryForAll();
}
public User getUser(int userid) throws SQLException {
List<User> result = this.userDao.queryForEq("userid", userid);
if (!result.isEmpty())
return result.get(0);
return null;
}
public User getUser(String name) throws SQLException {
List<User> result = this.userDao.queryForEq("name", name);
if (!result.isEmpty())
return result.get(0);
return null;
}
}
\ No newline at end of file
WarpDrinkApi/src/main/java/ms/itsecteam/warpdrink/objects/User.java deleted 100644 → 0
View file @ f73a1684
package ms.itsecteam.warpdrink.objects;
import javax.xml.bind.annotation.XmlRootElement;
import com.j256.ormlite.field.DatabaseField;
import com.j256.ormlite.table.DatabaseTable;
@XmlRootElement
@DatabaseTable(tableName = "users")
public class User {
@DatabaseField(generatedId = true)
private int userid;
@DatabaseField(columnName = "name",unique = true, canBeNull = false)
private String name;
@DatabaseField(columnName = "credit")
private double credit;
public User() {
super();
}
public User(String name, double credit) {
super();
this.name = name;
this.credit = credit;
}
public int getUserid() {
return userid;
}
public void setUserid(int userid) {
this.userid = userid;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public double getCredit() {
return credit;
}
public void setCredit(double credit) {
this.credit = credit;
}
public String toString() {
return "[Name: "+this.name+", Credit:"+this.credit+"]";
}
@Override
public boolean equals(Object other) {
if (other == null || other.getClass() != getClass()) {
return false;
}
return name.equals(((User) other).name);
}
}
WarpDrinkApi/src/main/java/ms/itsecteam/warpdrink/provider/UserProvider.java deleted 100644 → 0
View file @ f73a1684
package ms.itsecteam.warpdrink.provider;
import java.sql.SQLException;
import java.util.List;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import com.google.gson.Gson;
import ms.itsecteam.warpdrink.UserDao;
import ms.itsecteam.warpdrink.objects.User;
@Path("user")
public class UserProvider {
List<User> users;
public UserProvider() {
try {
users = UserDao.getInstance().getAllUsers();
} catch (SQLException e) {
e.printStackTrace();
}
}
@GET
@Path("/all")
@Produces(MediaType.APPLICATION_JSON)
public String getUsers() {
List<User> users;
try {
users = UserDao.getInstance().getAllUsers();
if(users != null){
return new Gson().toJson(users,users.getClass());
}
} catch (SQLException e) {
e.printStackTrace();
}
return "";
}
@GET
@Path("/{userid}")
@Produces(MediaType.APPLICATION_JSON)
public User getUser(@PathParam("userid") int userid) {
try {
return UserDao.getInstance().getUser(userid);
} catch (SQLException e) {
e.printStackTrace();
}
return null;
}
@POST
@Path("/{userid}")
@Produces(MediaType.APPLICATION_JSON)
public void setUser(@PathParam("userid") int userid, @FormParam("credit") double credit) throws SQLException {
User user = UserDao.getInstance().getUser(userid);
user.setCredit(credit);
UserDao.getInstance().saveUser(user);
}
@PUT
@Path("/create")
@Produces(MediaType.APPLICATION_JSON)
public User createUser(@FormParam("name") String name) throws SQLException {
if(UserDao.getInstance().getUser(name) == null){
User user = new User(name,0.0);
UserDao.getInstance().saveUser(user);
return user;
}
return null;
}
}
\ No newline at end of file
WarpDrinkApi/src/main/webapp/WEB-INF/web.xml deleted 100644 → 0
View file @ f73a1684
<!DOCTYPE web-app PUBLIC
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd" >
<web-app>
<servlet>
<servlet-name>REST Service</servlet-name>
<servlet-class>ms.itsecteam.warpdrink.Servlet</servlet-class>
<init-param>
<param-name>com.sun.jersey.config.property.packages</param-name>
<param-value>ms.itsecteam.warpdrink.provider</param-value>
</init-param>
</servlet>
<servlet-mapping>
<servlet-name>REST Service</servlet-name>
<url-pattern>/rest/*</url-pattern>
</servlet-mapping>
</web-app>
WarpDrinkApi/src/main/webapp/index.jsp deleted 100644 → 0
View file @ f73a1684
<html>
<body>
<h2>Hello World!</h2>
</body>
</html>
WarpDrinkApp/.idea/.name deleted 100644 → 0
View file @ f73a1684
WarpDrinkApp
\ No newline at end of file
WarpDrinkApp/.idea/compiler.xml deleted 100644 → 0
View file @ f73a1684
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<resourceExtensions />
<wildcardResourcePatterns>
<entry name="!?*.java" />
<entry name="!?*.form" />
<entry name="!?*.class" />
<entry name="!?*.groovy" />
<entry name="!?*.scala" />
<entry name="!?*.flex" />
<entry name="!?*.kt" />
<entry name="!?*.clj" />
<entry name="!?*.aj" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
</component>
</project>
\ No newline at end of file
WarpDrinkApp/.idea/encodings.xml deleted 100644 → 0
View file @ f73a1684
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="PROJECT" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
WarpDrinkApp/.idea/gradle.xml deleted 100644 → 0
View file @ f73a1684
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.8" />
<option name="gradleJvm" value="1.7" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
</GradleProjectSettings>
</option>
</component>
</project>
\ No newline at end of file
WarpDrinkApp/.idea/inspectionProfiles/Project_Default.xml deleted 100644 → 0
View file @ f73a1684
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="AndroidLintRtlHardcoded" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
<option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
<option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
</inspection_tool>
</profile>
</component>
\ No newline at end of file
WarpDrinkApp/.idea/inspectionProfiles/profiles_settings.xml deleted 100644 → 0
View file @ f73a1684
<component name="InspectionProjectProfileManager">
<settings>
<option name="PROJECT_PROFILE" value="Project Default" />
<option name="USE_PROJECT_PROFILE" value="true" />
<version value="1.0" />
</settings>
</component>
\ No newline at end of file
WarpDrinkApp/.idea/misc.xml deleted 100644 → 0
View file @ f73a1684
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
</list>
</value>
</option>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>
\ No newline at end of file
WarpDrinkApp/.idea/modules.xml deleted 100644 → 0
View file @ f73a1684
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/WarpDrinkApp.iml" filepath="$PROJECT_DIR$/WarpDrinkApp.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules>
</component>
</project>
\ No newline at end of file
WarpDrinkApp/.idea/runConfigurations.xml deleted 100644 → 0
View file @ f73a1684
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
</set>
</option>
</component>
</project>
\ No newline at end of file
WarpDrinkApp/.idea/vcs.xml deleted 100644 → 0
View file @ f73a1684
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="" />
</component>
</project>
\ No newline at end of file
WarpDrinkApp/WarpDrink.iml
View file @ a73494b9
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="WarpDrink" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<module external.linked.project.id="WarpPay" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
......