提交: 0c1ba6629e766ad8d901ec42678c7f188adc88c3 - HotshotWebServer (hg)

Commit MetaInfo

• 修訂: 0c1ba6629e766ad8d901ec42678c7f188adc88c3 (tree)
• 時間: 2021-09-29 02:59:08
• 作者: Sebastian Bugiu <sebastian.bugiu@head...>
• Commiter: Sebastian Bugiu

Log Message

Adapted stuff for glassfish5.

Change Summary

• modified: .idea/artifacts/HotshotWebServer5_war_exploded.xml
• modified: .idea/dataSources.xml
• modified: HotshotWebServer5.iml
• add: .hgignore
• add: .idea/artifacts/HotshotWebServer5_javaEEApplication_exploded.xml
• add: .idea/libraries/JAX_RS_2_1_1.xml
• add: .idea/libraries/asm_all_repackaged_2_2_0_b14.xml
• add: .idea/libraries/javaee_api.xml
• add: .idea/libraries/mysql_connector_java.xml
• add: .idea/runConfigurations.xml
• delete: .idea/libraries/Jersey_2_2.xml
• delete: .idea/libraries/aopalliance_repackaged_2_4_0_b09.xml

差異

diff -r 9bb9f90e6b3a -r 0c1ba6629e76 .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Tue Sep 28 20:59:08 2021 +0300
@@ -0,0 +1,4 @@
+# Datasource local storage ignored files
+.idea/dataSources/
+.svn/*
+out/*

diff -r 9bb9f90e6b3a -r 0c1ba6629e76 .idea/artifacts/HotshotWebServer5_javaEEApplication_exploded.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/artifacts/HotshotWebServer5_javaEEApplication_exploded.xml	Tue Sep 28 20:59:08 2021 +0300
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="exploded-ear" name="HotshotWebServer5:javaEEApplication exploded">
+    <output-path>$PROJECT_DIR$/out/artifacts/HotshotWebServer5_javaEEApplication_exploded</output-path>
+    <root id="root">
+      <element id="javaee-facet-resources" facet="HotshotWebServer5/javaeeApplication/javaEEApplication" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file

diff -r 9bb9f90e6b3a -r 0c1ba6629e76 .idea/artifacts/HotshotWebServer5_war_exploded.xml
--- a/.idea/artifacts/HotshotWebServer5_war_exploded.xml	Mon Feb 04 23:54:54 2019 +0200
+++ b/.idea/artifacts/HotshotWebServer5_war_exploded.xml	Tue Sep 28 20:59:08 2021 +0300
@@ -11,6 +11,8 @@
           <element id="library" level="project" name="Mojarra-2.2.1" />
           <element id="library" level="project" name="JPA 2.1-JPA 2.1" />
           <element id="library" level="project" name="gson-2.3.1-javadoc" />
+          <element id="library" level="project" name="JAX-RS-2.1.1" />
+          <element id="library" level="project" name="mysql.connector.java" />
         </element>
       </element>
     </root>

diff -r 9bb9f90e6b3a -r 0c1ba6629e76 .idea/dataSources.xml
--- a/.idea/dataSources.xml	Mon Feb 04 23:54:54 2019 +0200
+++ b/.idea/dataSources.xml	Tue Sep 28 20:59:08 2021 +0300
@@ -2,17 +2,10 @@
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
     <data-source source="LOCAL" name="MySQL - hotshot_user_stats@localhost" uuid="f575cc8a-3110-42b4-8bae-b44f8aa70b2d">
-      <driver-ref>mysql</driver-ref>
+      <driver-ref>mysql.8</driver-ref>
       <synchronize>true</synchronize>
-      <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
       <jdbc-url>jdbc:mysql://localhost:3306/hotshot_user_stats</jdbc-url>
-      <driver-properties>
-        <property name="zeroDateTimeBehavior" value="convertToNull" />
-        <property name="tinyInt1isBit" value="false" />
-        <property name="characterEncoding" value="utf8" />
-        <property name="characterSetResults" value="utf8" />
-        <property name="yearIsDateType" value="false" />
-      </driver-properties>
     </data-source>
   </component>
 </project>
\ No newline at end of file

diff -r 9bb9f90e6b3a -r 0c1ba6629e76 .idea/libraries/JAX_RS_2_1_1.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/JAX_RS_2_1_1.xml	Tue Sep 28 20:59:08 2021 +0300
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="JAX-RS-2.1.1" type="JAX-RS">
+    <properties version="2.1.1" />
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/javax.ws.rs-api-2.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file

diff -r 9bb9f90e6b3a -r 0c1ba6629e76 .idea/libraries/Jersey_2_2.xml
--- a/.idea/libraries/Jersey_2_2.xml	Mon Feb 04 23:54:54 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<component name="libraryTable">
-  <library name="Jersey-2.2" type="JAX-RS">
-    <properties version="2.2" />
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/jersey-client.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/cglib-2.2.0-b14.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jersey-container-servlet-core.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jersey-common.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/asm-all-repackaged-2.2.0-b14.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jersey-container-servlet.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/javax.ws.rs-api-2.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jersey-server.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/hk2-locator-2.2.0-b14.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/hk2-api-2.2.0-b14.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/hk2-utils-2.2.0-b14.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/javax.annotation-api-1.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jaxb-api-2.2.7.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/javax.servlet-api-3.0.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/javax.inject-2.2.0-b14.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/guava-14.0.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/org.osgi.core-4.2.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/osgi-resource-locator-1.0.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/validation-api-1.1.0.Final.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/persistence-api-1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="file://C:/glassfish4/docs/api" />
-    </JAVADOC>
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file

diff -r 9bb9f90e6b3a -r 0c1ba6629e76 .idea/libraries/aopalliance_repackaged_2_4_0_b09.xml
--- a/.idea/libraries/aopalliance_repackaged_2_4_0_b09.xml	Mon Feb 04 23:54:54 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<component name="libraryTable">
-  <library name="aopalliance-repackaged-2.4.0-b09">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/ext/aopalliance-repackaged-2.4.0-b09.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/ext/asm-debug-all-5.0.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/ext/hk2-api-2.4.0-b09.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/ext/hk2-locator-2.4.0-b09.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/ext/hk2-utils-2.4.0-b09.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/ext/javassist-3.18.1-GA.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/ext/javax.annotation-api-1.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/ext/javax.inject-2.4.0-b09.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/ext/javax.servlet-api-3.0.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/ext/jaxb-api-2.2.7.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/ext/jersey-guava-2.16.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/ext/osgi-resource-locator-1.0.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/ext/persistence-api-1.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/ext/validation-api-1.1.0.Final.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/api/javax.ws.rs-api-2.0.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/lib/jersey-client.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/lib/jersey-common.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/lib/jersey-container-servlet-core.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/lib/jersey-container-servlet.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/lib/jersey-media-jaxb.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/lib/jersey-server.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../jaxrs-ri-2.16/jaxrs-ri/ext/org.osgi.core-4.2.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="file://C:/glassfish4/docs/api" />
-    </JAVADOC>
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file

diff -r 9bb9f90e6b3a -r 0c1ba6629e76 .idea/libraries/asm_all_repackaged_2_2_0_b14.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/asm_all_repackaged_2_2_0_b14.xml	Tue Sep 28 20:59:08 2021 +0300
@@ -0,0 +1,39 @@
+<component name="libraryTable">
+  <library name="asm-all-repackaged-2.2.0-b14">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/asm-all-repackaged-2.2.0-b14.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/cglib-2.2.0-b14.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/gson-2.3.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/guava-14.0.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/hk2-api-2.2.0-b14.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/hk2-locator-2.2.0-b14.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/hk2-utils-2.2.0-b14.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.annotation-api-1.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.faces-2.2.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.inject-2.2.0-b14.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.persistence.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.persistence_2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.servlet-api-3.0.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.ws.rs-api-2.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.ws.rs-api-2.1.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jaxb-api-2.2.7.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jersey-client.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jersey-common.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jersey-container-servlet-core.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jersey-container-servlet.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jersey-server.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jstl-1.1.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/osgi-resource-locator-1.0.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/persistence-api-1.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/validation-api-1.1.0.Final.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/org.osgi.core-4.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/lib/gson-2.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/lib/gson-2.3.1-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/org.osgi.core-4.2.0.jar!/OSGI-OPT/src" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff -r 9bb9f90e6b3a -r 0c1ba6629e76 .idea/libraries/javaee_api.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/javaee_api.xml	Tue Sep 28 20:59:08 2021 +0300
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="javaee.api" type="repository">
+    <properties maven-id="javaee:javaee-api:5" />
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/javaee-api-5.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file

diff -r 9bb9f90e6b3a -r 0c1ba6629e76 .idea/libraries/mysql_connector_java.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/mysql_connector_java.xml	Tue Sep 28 20:59:08 2021 +0300
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="mysql.connector.java" type="repository">
+    <properties maven-id="mysql:mysql-connector-java:5.1.49" />
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/mysql-connector-java-5.1.49.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file

diff -r 9bb9f90e6b3a -r 0c1ba6629e76 .idea/runConfigurations.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/runConfigurations.xml	Tue Sep 28 20:59:08 2021 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file

diff -r 9bb9f90e6b3a -r 0c1ba6629e76 HotshotWebServer5.iml
--- a/HotshotWebServer5.iml	Mon Feb 04 23:54:54 2019 +0200
+++ b/HotshotWebServer5.iml	Tue Sep 28 20:59:08 2021 +0300
@@ -37,8 +37,12 @@
     <orderEntry type="library" name="Mojarra-2.2.1" level="project" />
     <orderEntry type="library" name="JPA 2.1-JPA 2.1" level="project" />
     <orderEntry type="library" name="gson-2.3.1-javadoc" level="project" />
-    <orderEntry type="library" name="aopalliance-repackaged-2.4.0-b09" level="project" />
     <orderEntry type="library" scope="TEST" name="junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="GlassFish 5.0.0" level="application_server_libraries" />
+    <orderEntry type="library" name="JAX-RS-2.1.1" level="project" />
+    <orderEntry type="library" name="JAX-RS-2.1.1" level="project" />
+    <orderEntry type="library" name="asm-all-repackaged-2.2.0-b14" level="project" />
+    <orderEntry type="library" name="javaee.api" level="project" />
+    <orderEntry type="library" name="mysql.connector.java" level="project" />
   </component>
 </module>
\ No newline at end of file