Skip to content
Snippets Groups Projects
Commit 367923ba authored by Arthur Belousov's avatar Arthur Belousov
Browse files

Aufgabe 1 aus Übungsblatt 2 bearbeitet

parent f2d42a09
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 381 additions and 7 deletions
uebung2/.idea/.gitignore 0 → 100644
+ 8
− 0
View file @ 367923ba
# Default ignored files
/shelf/
/workspace.xml
# Datasource local storage ignored files
/../../../../../../../../../../../../:\Users\Administrator\Desktop\Universität Bremen\Semester 5\SWP2\Vorbereitung\Repository\miniprojekt2020\uebung2\.idea/dataSources/
/dataSources.local.xml
# Editor-based HTTP Client requests
/httpRequests/
uebung2/.idea/artifacts/uebung2_war.xml 0 → 100644
+ 14
− 0
View file @ 367923ba
<component name="ArtifactManager">
<artifact type="war" name="uebung2:war">
<output-path>$PROJECT_DIR$/target</output-path>
<properties id="maven-jee-properties">
<options>
<module>uebung2</module>
<packaging>war</packaging>
</options>
</properties>
<root id="archive" name="uebung2-1.0.war">
<element id="artifact" artifact-name="uebung2:war exploded" />
</root>
</artifact>
</component>
\ No newline at end of file
uebung2/.idea/artifacts/uebung2_war_exploded.xml 0 → 100644
+ 23
− 0
View file @ 367923ba
<component name="ArtifactManager">
<artifact type="exploded-war" name="uebung2:war exploded">
<output-path>$PROJECT_DIR$/target/uebung2-1.0</output-path>
<properties id="maven-jee-properties">
<options>
<exploded>true</exploded>
<module>uebung2</module>
<packaging>war</packaging>
</options>
</properties>
<root id="root">
<element id="directory" name="WEB-INF">
<element id="directory" name="classes">
<element id="module-output" name="uebung2" />
</element>
</element>
<element id="directory" name="META-INF">
<element id="file-copy" path="$PROJECT_DIR$/target/uebung2-1.0/META-INF/MANIFEST.MF" />
</element>
<element id="javaee-facet-resources" facet="uebung2/web/Web" />
</root>
</artifact>
</component>
\ No newline at end of file
uebung2/.idea/compiler.xml 0 → 100644
+ 16
− 0
View file @ 367923ba
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="uebung2" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="uebung2" target="11" />
</bytecodeTargetLevel>
</component>
</project>
\ No newline at end of file
uebung2/.idea/encodings.xml 0 → 100644
+ 6
− 0
View file @ 367923ba
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
uebung2/.idea/jarRepositories.xml 0 → 100644
+ 20
− 0
View file @ 367923ba
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
</component>
</project>
\ No newline at end of file
uebung2/.idea/libraries/Maven__com_sun_mail_javax_mail_1_6_0.xml 0 → 100644
+ 13
− 0
View file @ 367923ba
<component name="libraryTable">
<library name="Maven: com.sun.mail:javax.mail:1.6.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/mail/javax.mail/1.6.0/javax.mail-1.6.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/mail/javax.mail/1.6.0/javax.mail-1.6.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/mail/javax.mail/1.6.0/javax.mail-1.6.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
uebung2/.idea/libraries/Maven__javax_activation_activation_1_1.xml 0 → 100644
+ 13
− 0
View file @ 367923ba
<component name="libraryTable">
<library name="Maven: javax.activation:activation:1.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
uebung2/.idea/libraries/Maven__javax_javaee_api_8_0.xml 0 → 100644
+ 13
− 0
View file @ 367923ba
<component name="libraryTable">
<library name="Maven: javax:javaee-api:8.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/javax/javaee-api/8.0/javaee-api-8.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/javax/javaee-api/8.0/javaee-api-8.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/javax/javaee-api/8.0/javaee-api-8.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
uebung2/.idea/misc.xml 0 → 100644
+ 14
− 0
View file @ 367923ba
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="FrameworkDetectionExcludesConfiguration">
<file type="web" url="file://$PROJECT_DIR$" />
</component>
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
uebung2/.idea/modules.xml 0 → 100644
+ 8
− 0
View file @ 367923ba
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/uebung2.iml" filepath="$PROJECT_DIR$/uebung2.iml" />
</modules>
</component>
</project>
\ No newline at end of file
uebung2/.idea/vcs.xml 0 → 100644
+ 6
− 0
View file @ 367923ba
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>
\ No newline at end of file
uebung2/.idea/workspace.xml 0 → 100644
+ 96
− 0
View file @ 367923ba
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="b002ab92-89df-438b-a79d-54fbba05e4b7" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/.idea/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/artifacts/uebung2_war.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/artifacts/uebung2_war_exploded.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_mail_javax_mail_1_6_0.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_javaee_api_8_0.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/allah.txt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/beans.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/uebung2.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../übung1/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../übung1/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../übung1/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/../übung1/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../übung1/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/../übung1/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../übung1/target/surefire-reports/TEST-de.unibremen.swp.ConverterTest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../übung1/target/surefire-reports/TEST-de.unibremen.swp.ConverterTest.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../übung1/target/surefire-reports/TEST-de.unibremen.swp.ParserTest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../übung1/target/surefire-reports/TEST-de.unibremen.swp.ParserTest.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../übung1/target/surefire-reports/de.unibremen.swp.ConverterTest.txt" beforeDir="false" afterPath="$PROJECT_DIR$/../übung1/target/surefire-reports/de.unibremen.swp.ConverterTest.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../übung1/target/surefire-reports/de.unibremen.swp.ParserTest.txt" beforeDir="false" afterPath="$PROJECT_DIR$/../übung1/target/surefire-reports/de.unibremen.swp.ParserTest.txt" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
<option name="mavenHome" value="C:\Program Files\JetBrains\IntelliJ IDEA 2020.2.3\plugins\maven\lib\maven3" />
</MavenGeneralSettings>
</option>
</component>
<component name="ProjectId" id="1jnWXVHkJRmmXwpVFMo9fr2Bb0U" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.path.for.package.eslint" value="project" />
<property name="node.js.path.for.package.tslint" value="project" />
<property name="node.js.selected.package.eslint" value="(autodetect)" />
<property name="node.js.selected.package.tslint" value="(autodetect)" />
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="b002ab92-89df-438b-a79d-54fbba05e4b7" name="Default Changelist" comment="" />
<created>1604440376331</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1604440376331</updated>
<workItem from="1604440377438" duration="2248000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
</component>
<component name="WindowStateProjectService">
<state x="303" y="1" key="search.everywhere.popup" timestamp="1604440725266">
<screen x="0" y="0" width="1280" height="680" />
</state>
<state x="303" y="1" key="search.everywhere.popup/0.0.1280.680@0.0.1280.680" timestamp="1604440725266" />
</component>
</project>
\ No newline at end of file
uebung2/pom.xml 0 → 100644
+ 36
− 0
View file @ 367923ba
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.unibremen.swp</groupId>
<artifactId>uebung2</artifactId>
<version>1.0</version>
<packaging>war</packaging>
<name>uebung2</name>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>8.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version>
</plugin>
</plugins>
</build>
</project>
uebung2/src/main/webapp/WEB-INF/beans.xml 0 → 100644
+ 8
− 0
View file @ 367923ba
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
version="2.0" bean-discovery-mode="annotated">
</beans>
\ No newline at end of file
uebung2/src/main/webapp/WEB-INF/web.xml 0 → 100644
+ 19
− 0
View file @ 367923ba
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
version="4.0">
<servlet>
<servlet-name>FacesServlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>FacesServlet</servlet-name>
<url-pattern>*.xhtml</url-pattern>
</servlet-mapping>
</web-app>
uebung2/uebung2.iml 0 → 100644
+ 36
− 0
View file @ 367923ba
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<datasource-mapping />
<naming-strategy-map />
</configuration>
</facet>
<facet type="web" name="Web">
<configuration>
<webroots>
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
</webroots>
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
</sourceRoots>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax:javaee-api:8.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sun.mail:javax.mail:1.6.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.activation:activation:1.1" level="project" />
</component>
</module>
\ No newline at end of file
übung1/pom.xml
+ 25
− 0
View file @ 367923ba
......@@ -60,6 +60,31 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<descriptorRefs>
<descriptorRef>src</descriptorRef>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<mainClass>de.unibremen.swp.Main</mainClass>
</manifest>
</archive>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
übung1/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+ 5
− 5
View file @ 367923ba
C:\Users\Administrator\Desktop\Universitt Bremen\Semester 5\SWP2\Vorbereitung\Repository\miniprojekt2020\bung1\src\main\java\JSONUser\JSONUser.java
C:\Users\Administrator\Desktop\Universitt Bremen\Semester 5\SWP2\Vorbereitung\Repository\miniprojekt2020\bung1\src\main\java\CSVUser\CSVUser.java
C:\Users\Administrator\Desktop\Universitt Bremen\Semester 5\SWP2\Vorbereitung\Repository\miniprojekt2020\bung1\src\main\java\Main\Main.java
C:\Users\Administrator\Desktop\Universitt Bremen\Semester 5\SWP2\Vorbereitung\Repository\miniprojekt2020\bung1\src\main\java\Parser\Parser.java
C:\Users\Administrator\Desktop\Universitt Bremen\Semester 5\SWP2\Vorbereitung\Repository\miniprojekt2020\bung1\src\main\java\Converter\Converter.java
C:\Users\Administrator\Desktop\Universität Bremen\Semester 5\SWP2\Vorbereitung\Repository\miniprojekt2020\übung1\src\main\java\de\unibremen\swp\Converter.java
C:\Users\Administrator\Desktop\Universität Bremen\Semester 5\SWP2\Vorbereitung\Repository\miniprojekt2020\übung1\src\main\java\de\unibremen\swp\Parser.java
C:\Users\Administrator\Desktop\Universität Bremen\Semester 5\SWP2\Vorbereitung\Repository\miniprojekt2020\übung1\src\main\java\de\unibremen\swp\data\JSONUser.java
C:\Users\Administrator\Desktop\Universität Bremen\Semester 5\SWP2\Vorbereitung\Repository\miniprojekt2020\übung1\src\main\java\de\unibremen\swp\Main.java
C:\Users\Administrator\Desktop\Universität Bremen\Semester 5\SWP2\Vorbereitung\Repository\miniprojekt2020\übung1\src\main\java\de\unibremen\swp\data\CSVUser.java
übung1/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+ 2
− 2
View file @ 367923ba
C:\Users\Administrator\Desktop\Universitt Bremen\Semester 5\SWP2\Vorbereitung\Repository\miniprojekt2020\bung1\src\test\java\Convertertest\ConverterTest.java
C:\Users\Administrator\Desktop\Universitt Bremen\Semester 5\SWP2\Vorbereitung\Repository\miniprojekt2020\bung1\src\test\java\Parsertest\ParserTest.java
C:\Users\Administrator\Desktop\Universitt Bremen\Semester 5\SWP2\Vorbereitung\Repository\miniprojekt2020\bung1\src\test\java\de\unibremen\swp\ConverterTest.java
C:\Users\Administrator\Desktop\Universitt Bremen\Semester 5\SWP2\Vorbereitung\Repository\miniprojekt2020\bung1\src\test\java\de\unibremen\swp\ParserTest.java
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment