tdlight-team/TDLightTelegramBots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #180 from rubenlagus/dev

Browse Source 
Dev
This commit is contained in:
Ruben Bermudez 2016-12-26 04:03:39 +01:00 committed by GitHub
commit 69b000232d
28 changed files with 462 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

326
Bots.ipr
View File

@ -17,7 +17,7 @@
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" /> <outputRelativeToContentRoot value="true" />
<module name="telegrambots" /> <module name="telegrambots" />
<module name="telegrambotsmeta" /> <module name="telegrambots-meta" />
</profile> </profile>
<profile name="Annotation profile for Bots" enabled="true"> <profile name="Annotation profile for Bots" enabled="true">
<sourceOutputDir name="../telegrambots/target/generated-sources/annotations" /> <sourceOutputDir name="../telegrambots/target/generated-sources/annotations" />
@ -29,12 +29,12 @@
<bytecodeTargetLevel> <bytecodeTargetLevel>
<module name="Bots" target="1.5" /> <module name="Bots" target="1.5" />
<module name="telegrambots" target="1.8" /> <module name="telegrambots" target="1.8" />
<module name="telegrambotsmeta" target="1.8" /> <module name="telegrambots-meta" target="1.8" />
</bytecodeTargetLevel> </bytecodeTargetLevel>
</component> </component>
<component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8"> <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
<file url="file://$PROJECT_DIR$/telegrambots" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/telegrambots" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/telegrambotsmeta" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/telegrambots-meta" charset="UTF-8" />
<file url="PROJECT" charset="UTF-8" /> <file url="PROJECT" charset="UTF-8" />
</component> </component>
<component name="InspectionProjectProfileManager"> <component name="InspectionProjectProfileManager">
@ -261,7 +261,7 @@
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/Bots.iml" filepath="$PROJECT_DIR$/Bots.iml" /> <module fileurl="file://$PROJECT_DIR$/Bots.iml" filepath="$PROJECT_DIR$/Bots.iml" />
<module fileurl="file://$PROJECT_DIR$/telegrambots/telegrambots.iml" filepath="$PROJECT_DIR$/telegrambots/telegrambots.iml" /> <module fileurl="file://$PROJECT_DIR$/telegrambots/telegrambots.iml" filepath="$PROJECT_DIR$/telegrambots/telegrambots.iml" />
<module fileurl="file://$PROJECT_DIR$/telegrambotsmeta/telegrambotsmeta.iml" filepath="$PROJECT_DIR$/telegrambotsmeta/telegrambotsmeta.iml" /> <module fileurl="file://$PROJECT_DIR$/telegrambots-meta/telegrambots-meta.iml" filepath="$PROJECT_DIR$/telegrambots-meta/telegrambots-meta.iml" />
</modules> </modules>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
@ -292,12 +292,18 @@
<root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/19.0/guava-19.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/19.0/guava-19.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/4.1.0/guice-4.1.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/19.0/guava-19.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/4.1.0/guice-4.1.0-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/4.1.0/guice-4.1.0-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/4.1.0/guice-4.1.0-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/4.1.0/guice-4.1.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/4.1.0/guice-4.1.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/4.1.0/guice-4.1.0-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: aopalliance:aopalliance:1.0"> <library name="Maven: aopalliance:aopalliance:1.0">
@ -311,70 +317,70 @@
<root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.4"> <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.5">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.4/jackson-annotations-2.8.4.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.5/jackson-annotations-2.8.5.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.4/jackson-annotations-2.8.4-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.5/jackson-annotations-2.8.5-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.4/jackson-annotations-2.8.4-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.8.5/jackson-annotations-2.8.5-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.4"> <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.5">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.4/jackson-core-2.8.4.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.5/jackson-core-2.8.5.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.4/jackson-core-2.8.4-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.5/jackson-core-2.8.5-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.4/jackson-core-2.8.4-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.8.5/jackson-core-2.8.5-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.4"> <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.5">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.4/jackson-databind-2.8.4.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.5/jackson-databind-2.8.5.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.4/jackson-databind-2.8.4-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.5/jackson-databind-2.8.5-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.4/jackson-databind-2.8.4-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.8.5/jackson-databind-2.8.5-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.5.4"> <library name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.8.4">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.5.4/jackson-jaxrs-base-2.5.4.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.8.4/jackson-jaxrs-base-2.8.4.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.5.4/jackson-jaxrs-base-2.5.4-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.8.4/jackson-jaxrs-base-2.8.4-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.5.4/jackson-jaxrs-base-2.5.4-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.8.4/jackson-jaxrs-base-2.8.4-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.5.4"> <library name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.8.4">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.5.4/jackson-jaxrs-json-provider-2.5.4.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.8.4/jackson-jaxrs-json-provider-2.8.4.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.5.4/jackson-jaxrs-json-provider-2.5.4-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.8.4/jackson-jaxrs-json-provider-2.8.4-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.5.4/jackson-jaxrs-json-provider-2.5.4-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.8.4/jackson-jaxrs-json-provider-2.8.4-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.5.4"> <library name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.8.4">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.5.4/jackson-module-jaxb-annotations-2.5.4.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.8.4/jackson-module-jaxb-annotations-2.8.4.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.5.4/jackson-module-jaxb-annotations-2.5.4-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.8.4/jackson-module-jaxb-annotations-2.8.4-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.5.4/jackson-module-jaxb-annotations-2.5.4-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.8.4/jackson-module-jaxb-annotations-2.8.4-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: com.google.guava:guava:19.0"> <library name="Maven: com.google.guava:guava:19.0">
@ -399,72 +405,6 @@
<root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/4.1.0/guice-4.1.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/4.1.0/guice-4.1.0-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: com.sun.jersey:jersey-bundle:1.19.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-bundle/1.19.3/jersey-bundle-1.19.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-bundle/1.19.3/jersey-bundle-1.19.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-bundle/1.19.3/jersey-bundle-1.19.3-sources.jar!/" />
</SOURCES>
</library>
<library name="Maven: com.sun.jersey:jersey-core:1.19.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-core/1.19.3/jersey-core-1.19.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-core/1.19.3/jersey-core-1.19.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-core/1.19.3/jersey-core-1.19.3-sources.jar!/" />
</SOURCES>
</library>
<library name="Maven: com.sun.jersey:jersey-grizzly2-servlet:1.19.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-grizzly2-servlet/1.19.3/jersey-grizzly2-servlet-1.19.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-grizzly2-servlet/1.19.3/jersey-grizzly2-servlet-1.19.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-grizzly2-servlet/1.19.3/jersey-grizzly2-servlet-1.19.3-sources.jar!/" />
</SOURCES>
</library>
<library name="Maven: com.sun.jersey:jersey-grizzly2:1.19.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-grizzly2/1.19.3/jersey-grizzly2-1.19.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-grizzly2/1.19.3/jersey-grizzly2-1.19.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-grizzly2/1.19.3/jersey-grizzly2-1.19.3-sources.jar!/" />
</SOURCES>
</library>
<library name="Maven: com.sun.jersey:jersey-server:1.19.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-server/1.19.3/jersey-server-1.19.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-server/1.19.3/jersey-server-1.19.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-server/1.19.3/jersey-server-1.19.3-sources.jar!/" />
</SOURCES>
</library>
<library name="Maven: com.sun.jersey:jersey-servlet:1.19.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-servlet/1.19.3/jersey-servlet-1.19.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-servlet/1.19.3/jersey-servlet-1.19.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-servlet/1.19.3/jersey-servlet-1.19.3-sources.jar!/" />
</SOURCES>
</library>
<library name="Maven: commons-codec:commons-codec:1.9"> <library name="Maven: commons-codec:commons-codec:1.9">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9.jar!/" />
@ -553,17 +493,6 @@
<root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/javax.ws.rs-api/2.0.1/javax.ws.rs-api-2.0.1-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/javax.ws.rs-api/2.0.1/javax.ws.rs-api-2.0.1-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: javax.ws.rs:jsr311-api:1.1.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1-sources.jar!/" />
</SOURCES>
</library>
<library name="Maven: junit:junit:4.12"> <library name="Maven: junit:junit:4.12">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
@ -608,103 +537,103 @@
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.2/httpmime-4.5.2-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpmime/4.5.2/httpmime-4.5.2-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.grizzly:grizzly-framework:2.3.23"> <library name="Maven: org.glassfish.grizzly:grizzly-framework:2.3.28">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-framework/2.3.23/grizzly-framework-2.3.23.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-framework/2.3.28/grizzly-framework-2.3.28.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-framework/2.3.23/grizzly-framework-2.3.23-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-framework/2.3.28/grizzly-framework-2.3.28-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-framework/2.3.23/grizzly-framework-2.3.23-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-framework/2.3.28/grizzly-framework-2.3.28-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.grizzly:grizzly-http-server:2.3.23"> <library name="Maven: org.glassfish.grizzly:grizzly-http-server:2.3.28">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http-server/2.3.23/grizzly-http-server-2.3.23.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http-server/2.3.28/grizzly-http-server-2.3.28.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http-server/2.3.23/grizzly-http-server-2.3.23-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http-server/2.3.28/grizzly-http-server-2.3.28-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http-server/2.3.23/grizzly-http-server-2.3.23-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http-server/2.3.28/grizzly-http-server-2.3.28-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.grizzly:grizzly-http-servlet:2.2.16"> <library name="Maven: org.glassfish.grizzly:grizzly-http-servlet:2.3.28">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http-servlet/2.2.16/grizzly-http-servlet-2.2.16.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http-servlet/2.3.28/grizzly-http-servlet-2.3.28.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http-servlet/2.2.16/grizzly-http-servlet-2.2.16-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http-servlet/2.3.28/grizzly-http-servlet-2.3.28-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http-servlet/2.2.16/grizzly-http-servlet-2.2.16-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http-servlet/2.3.28/grizzly-http-servlet-2.3.28-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.grizzly:grizzly-http:2.3.23"> <library name="Maven: org.glassfish.grizzly:grizzly-http:2.3.28">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http/2.3.23/grizzly-http-2.3.23.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http/2.3.28/grizzly-http-2.3.28.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http/2.3.23/grizzly-http-2.3.23-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http/2.3.28/grizzly-http-2.3.28-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http/2.3.23/grizzly-http-2.3.23-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-http/2.3.28/grizzly-http-2.3.28-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b05"> <library name="Maven: org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b30">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/aopalliance-repackaged/2.5.0-b05/aopalliance-repackaged-2.5.0-b05.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/aopalliance-repackaged/2.5.0-b30/aopalliance-repackaged-2.5.0-b30.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/aopalliance-repackaged/2.5.0-b05/aopalliance-repackaged-2.5.0-b05-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/aopalliance-repackaged/2.5.0-b30/aopalliance-repackaged-2.5.0-b30-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/aopalliance-repackaged/2.5.0-b05/aopalliance-repackaged-2.5.0-b05-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/aopalliance-repackaged/2.5.0-b30/aopalliance-repackaged-2.5.0-b30-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.hk2.external:javax.inject:2.5.0-b05"> <library name="Maven: org.glassfish.hk2.external:javax.inject:2.5.0-b30">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/javax.inject/2.5.0-b05/javax.inject-2.5.0-b05.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/javax.inject/2.5.0-b30/javax.inject-2.5.0-b30.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/javax.inject/2.5.0-b05/javax.inject-2.5.0-b05-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/javax.inject/2.5.0-b30/javax.inject-2.5.0-b30-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/javax.inject/2.5.0-b05/javax.inject-2.5.0-b05-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/external/javax.inject/2.5.0-b30/javax.inject-2.5.0-b30-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.hk2:hk2-api:2.5.0-b05"> <library name="Maven: org.glassfish.hk2:hk2-api:2.5.0-b30">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-api/2.5.0-b05/hk2-api-2.5.0-b05.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-api/2.5.0-b30/hk2-api-2.5.0-b30.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-api/2.5.0-b05/hk2-api-2.5.0-b05-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-api/2.5.0-b30/hk2-api-2.5.0-b30-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-api/2.5.0-b05/hk2-api-2.5.0-b05-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-api/2.5.0-b30/hk2-api-2.5.0-b30-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.hk2:hk2-locator:2.5.0-b05"> <library name="Maven: org.glassfish.hk2:hk2-locator:2.5.0-b30">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-locator/2.5.0-b05/hk2-locator-2.5.0-b05.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-locator/2.5.0-b30/hk2-locator-2.5.0-b30.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-locator/2.5.0-b05/hk2-locator-2.5.0-b05-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-locator/2.5.0-b30/hk2-locator-2.5.0-b30-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-locator/2.5.0-b05/hk2-locator-2.5.0-b05-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-locator/2.5.0-b30/hk2-locator-2.5.0-b30-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.hk2:hk2-utils:2.5.0-b05"> <library name="Maven: org.glassfish.hk2:hk2-utils:2.5.0-b30">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-utils/2.5.0-b05/hk2-utils-2.5.0-b05.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-utils/2.5.0-b30/hk2-utils-2.5.0-b30.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-utils/2.5.0-b05/hk2-utils-2.5.0-b05-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-utils/2.5.0-b30/hk2-utils-2.5.0-b30-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-utils/2.5.0-b05/hk2-utils-2.5.0-b05-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/hk2-utils/2.5.0-b30/hk2-utils-2.5.0-b30-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.hk2:osgi-resource-locator:1.0.1"> <library name="Maven: org.glassfish.hk2:osgi-resource-locator:1.0.1">
@ -718,147 +647,147 @@
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/osgi-resource-locator/1.0.1/osgi-resource-locator-1.0.1-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/hk2/osgi-resource-locator/1.0.1/osgi-resource-locator-1.0.1-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.jersey.bundles.repackaged:jersey-guava:2.24"> <library name="Maven: org.glassfish.jersey.bundles.repackaged:jersey-guava:2.25">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/bundles/repackaged/jersey-guava/2.24/jersey-guava-2.24.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/bundles/repackaged/jersey-guava/2.25/jersey-guava-2.25.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/bundles/repackaged/jersey-guava/2.24/jersey-guava-2.24-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/bundles/repackaged/jersey-guava/2.25/jersey-guava-2.25-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/bundles/repackaged/jersey-guava/2.24/jersey-guava-2.24-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/bundles/repackaged/jersey-guava/2.25/jersey-guava-2.25-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.jersey.containers:jersey-container-grizzly2-http:2.24"> <library name="Maven: org.glassfish.jersey.containers:jersey-container-grizzly2-http:2.25">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-grizzly2-http/2.24/jersey-container-grizzly2-http-2.24.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-grizzly2-http/2.25/jersey-container-grizzly2-http-2.25.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-grizzly2-http/2.24/jersey-container-grizzly2-http-2.24-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-grizzly2-http/2.25/jersey-container-grizzly2-http-2.25-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-grizzly2-http/2.24/jersey-container-grizzly2-http-2.24-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-grizzly2-http/2.25/jersey-container-grizzly2-http-2.25-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.jersey.containers:jersey-container-grizzly2-servlet:2.24"> <library name="Maven: org.glassfish.jersey.containers:jersey-container-grizzly2-servlet:2.25">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-grizzly2-servlet/2.24/jersey-container-grizzly2-servlet-2.24.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-grizzly2-servlet/2.25/jersey-container-grizzly2-servlet-2.25.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-grizzly2-servlet/2.24/jersey-container-grizzly2-servlet-2.24-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-grizzly2-servlet/2.25/jersey-container-grizzly2-servlet-2.25-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-grizzly2-servlet/2.24/jersey-container-grizzly2-servlet-2.24-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-grizzly2-servlet/2.25/jersey-container-grizzly2-servlet-2.25-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.jersey.containers:jersey-container-servlet-core:2.24"> <library name="Maven: org.glassfish.jersey.containers:jersey-container-servlet-core:2.25">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet-core/2.24/jersey-container-servlet-core-2.24.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet-core/2.25/jersey-container-servlet-core-2.25.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet-core/2.24/jersey-container-servlet-core-2.24-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet-core/2.25/jersey-container-servlet-core-2.25-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet-core/2.24/jersey-container-servlet-core-2.24-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet-core/2.25/jersey-container-servlet-core-2.25-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.jersey.containers:jersey-container-servlet:2.24"> <library name="Maven: org.glassfish.jersey.containers:jersey-container-servlet:2.25">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet/2.24/jersey-container-servlet-2.24.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet/2.25/jersey-container-servlet-2.25.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet/2.24/jersey-container-servlet-2.24-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet/2.25/jersey-container-servlet-2.25-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet/2.24/jersey-container-servlet-2.24-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/containers/jersey-container-servlet/2.25/jersey-container-servlet-2.25-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.jersey.core:jersey-client:2.24"> <library name="Maven: org.glassfish.jersey.core:jersey-client:2.25">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-client/2.24/jersey-client-2.24.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-client/2.25/jersey-client-2.25.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-client/2.24/jersey-client-2.24-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-client/2.25/jersey-client-2.25-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-client/2.24/jersey-client-2.24-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-client/2.25/jersey-client-2.25-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.jersey.core:jersey-common:2.24"> <library name="Maven: org.glassfish.jersey.core:jersey-common:2.25">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-common/2.24/jersey-common-2.24.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-common/2.25/jersey-common-2.25.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-common/2.24/jersey-common-2.24-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-common/2.25/jersey-common-2.25-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-common/2.24/jersey-common-2.24-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-common/2.25/jersey-common-2.25-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.jersey.core:jersey-server:2.24"> <library name="Maven: org.glassfish.jersey.core:jersey-server:2.25">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-server/2.24/jersey-server-2.24.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-server/2.25/jersey-server-2.25.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-server/2.24/jersey-server-2.24-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-server/2.25/jersey-server-2.25-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-server/2.24/jersey-server-2.24-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/core/jersey-server/2.25/jersey-server-2.25-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.jersey.ext:jersey-entity-filtering:2.24"> <library name="Maven: org.glassfish.jersey.ext:jersey-entity-filtering:2.25">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/ext/jersey-entity-filtering/2.24/jersey-entity-filtering-2.24.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/ext/jersey-entity-filtering/2.25/jersey-entity-filtering-2.25.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/ext/jersey-entity-filtering/2.24/jersey-entity-filtering-2.24-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/ext/jersey-entity-filtering/2.25/jersey-entity-filtering-2.25-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/ext/jersey-entity-filtering/2.24/jersey-entity-filtering-2.24-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/ext/jersey-entity-filtering/2.25/jersey-entity-filtering-2.25-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.jersey.media:jersey-media-jaxb:2.24"> <library name="Maven: org.glassfish.jersey.media:jersey-media-jaxb:2.25">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-jaxb/2.24/jersey-media-jaxb-2.24.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-jaxb/2.25/jersey-media-jaxb-2.25.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-jaxb/2.24/jersey-media-jaxb-2.24-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-jaxb/2.25/jersey-media-jaxb-2.25-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-jaxb/2.24/jersey-media-jaxb-2.24-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-jaxb/2.25/jersey-media-jaxb-2.25-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.jersey.media:jersey-media-json-jackson:2.24"> <library name="Maven: org.glassfish.jersey.media:jersey-media-json-jackson:2.25">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-json-jackson/2.24/jersey-media-json-jackson-2.24.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-json-jackson/2.25/jersey-media-json-jackson-2.25.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-json-jackson/2.24/jersey-media-json-jackson-2.24-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-json-jackson/2.25/jersey-media-json-jackson-2.25-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-json-jackson/2.24/jersey-media-json-jackson-2.24-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/media/jersey-media-json-jackson/2.25/jersey-media-json-jackson-2.25-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.24"> <library name="Maven: org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.25">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/test-framework/providers/jersey-test-framework-provider-grizzly2/2.24/jersey-test-framework-provider-grizzly2-2.24.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/test-framework/providers/jersey-test-framework-provider-grizzly2/2.25/jersey-test-framework-provider-grizzly2-2.25.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/test-framework/providers/jersey-test-framework-provider-grizzly2/2.24/jersey-test-framework-provider-grizzly2-2.24-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/test-framework/providers/jersey-test-framework-provider-grizzly2/2.25/jersey-test-framework-provider-grizzly2-2.25-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/test-framework/providers/jersey-test-framework-provider-grizzly2/2.24/jersey-test-framework-provider-grizzly2-2.24-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/test-framework/providers/jersey-test-framework-provider-grizzly2/2.25/jersey-test-framework-provider-grizzly2-2.25-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.glassfish.jersey.test-framework:jersey-test-framework-core:2.24"> <library name="Maven: org.glassfish.jersey.test-framework:jersey-test-framework-core:2.25">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/test-framework/jersey-test-framework-core/2.24/jersey-test-framework-core-2.24.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/test-framework/jersey-test-framework-core/2.25/jersey-test-framework-core-2.25.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/test-framework/jersey-test-framework-core/2.24/jersey-test-framework-core-2.24-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/test-framework/jersey-test-framework-core/2.25/jersey-test-framework-core-2.25-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/test-framework/jersey-test-framework-core/2.24/jersey-test-framework-core-2.24-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jersey/test-framework/jersey-test-framework-core/2.25/jersey-test-framework-core-2.25-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.hamcrest:hamcrest-core:1.3"> <library name="Maven: org.hamcrest:hamcrest-core:1.3">
@ -894,6 +823,17 @@
<root url="jar://$MAVEN_REPOSITORY$/org/json/json/20160810/json-20160810-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/json/json/20160810/json-20160810-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Maven: org.mockito:mockito-all:2.0.2-beta">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-all/2.0.2-beta/mockito-all-2.0.2-beta.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-all/2.0.2-beta/mockito-all-2.0.2-beta-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-all/2.0.2-beta/mockito-all-2.0.2-beta-sources.jar!/" />
</SOURCES>
</library>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>

4
README.md
View File

@ -31,8 +31,8 @@ Just import add the library to your project with one of these options:
</dependency> </dependency>
``` ```
2. Using Jitpack from [here](https://jitpack.io/#rubenlagus/TelegramBots/v2.4.4.1) 2. Using Jitpack from [here](https://jitpack.io/#rubenlagus/TelegramBots/2.4.4.3)
3. Download the jar(including all dependencies) from [here](https://github.com/rubenlagus/TelegramBots/releases/tag/v2.4.4.1) 3. Download the jar(including all dependencies) from [here](https://github.com/rubenlagus/TelegramBots/releases/tag/2.4.4.3)
In order to use Long Polling mode, just create your own bot extending `org.telegram.telegrambots.bots.TelegramLongPollingBot`. In order to use Long Polling mode, just create your own bot extending `org.telegram.telegrambots.bots.TelegramLongPollingBot`.

8
TelegramBots.wiki/Changelog.md
View File

@ -23,4 +23,10 @@
1. New `max_connections` in `setWebhook` method. 1. New `max_connections` in `setWebhook` method.
2. New `allowed_updates` in `setWebhook` and `getUpdates` 2. New `allowed_updates` in `setWebhook` and `getUpdates`
3. New `deleteWebhook` method 3. New `deleteWebhook` method
4. Added new configs to DefaultBotOptions to handle `max_connections` and `allowed_updates` 4. Added new configs to DefaultBotOptions to handle `max_connections` and `allowed_updates`
### <a id="2.4.4.3"></a>2.4.4.3 ###
1. In `BotSession`, renamed `close` to `stop`. `Close` method is maintained for backward compatibility.
2. Support crating webhook with HTTP servers (HTTPS must be managed via external tools)
**[[How to update to version 2.4.4.3|How-To-Update#2.4.4.3]]**

4
TelegramBots.wiki/Getting-Started.md
View File

@ -11,13 +11,13 @@ First you need ot get the library and add it to your project. There are few poss
<dependency> <dependency>
<groupId>org.telegram</groupId> <groupId>org.telegram</groupId>
<artifactId>telegrambots</artifactId> <artifactId>telegrambots</artifactId>
<version>2.4.4.1</version> <version>2.4.4.3</version>
</dependency> </dependency>
``` ```
* With **Gradle**: * With **Gradle**:
```groovy ```groovy
compile group: 'org.telegram', name: 'telegrambots', version: '2.4.4.1' compile group: 'org.telegram', name: 'telegrambots', version: '2.4.4.3'
``` ```
2. Don't like **Maven Central Repository**? It can also be taken from [Jitpack](https://jitpack.io/#rubenlagus/TelegramBots). 2. Don't like **Maven Central Repository**? It can also be taken from [Jitpack](https://jitpack.io/#rubenlagus/TelegramBots).

5
TelegramBots.wiki/How-To-Update.md
View File

@ -13,4 +13,7 @@
### <a id="2.4.4"></a>To version 2.4.4 ### ### <a id="2.4.4"></a>To version 2.4.4 ###
1. Replace `ReplyKeyboardHide` by `ReplyKeyboardRemove` and its field `hideKeyboard` by `removeKeyboard` (remember getter and setters) 1. Replace `ReplyKeyboardHide` by `ReplyKeyboardRemove` and its field `hideKeyboard` by `removeKeyboard` (remember getter and setters)
2. Replace usage of `edit_message` by `disable_edit_message` (see [this post](https://telegram.me/BotNews/22)) 2. Replace usage of `edit_message` by `disable_edit_message` (see [this post](https://telegram.me/BotNews/22))
3. Removed deprecated stuff from version 2.4.3 3. Removed deprecated stuff from version 2.4.3
### <a id="2.4.4.3"></a>To version 2.4.4.3 ###
1. Replace `BotSession.close()` by `BotSession.stop()`.

4
pom.xml
View File

@ -7,7 +7,7 @@
<groupId>org.telegram</groupId> <groupId>org.telegram</groupId>
<artifactId>Bots</artifactId> <artifactId>Bots</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.4.4.1</version> <version>2.4.4.3</version>
<modules> <modules>
<module>telegrambots</module> <module>telegrambots</module>
@ -24,6 +24,6 @@
<properties> <properties>
<maven.deploy.skip>true</maven.deploy.skip> <maven.deploy.skip>true</maven.deploy.skip>
<bots.version>2.4.4.1</bots.version> <bots.version>2.4.4.3</bots.version>
</properties> </properties>
</project> </project>

2
telegrambots-meta/pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.telegram</groupId> <groupId>org.telegram</groupId>
<artifactId>telegrambots-meta</artifactId> <artifactId>telegrambots-meta</artifactId>
<version>2.4.4.1</version> <version>2.4.4.3</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Telegram Bots Meta</name> <name>Telegram Bots Meta</name>

40
telegrambots-meta/src/main/java/org/telegram/telegrambots/TelegramBotsApi.java
View File

@ -28,7 +28,29 @@ public class TelegramBotsApi {
} }
/** /**
* Creates an HTTP server to receive webhook request
* @param externalUrl External base url for the webhook
* @param internalUrl Internal base url for the webhook
* *
* @implSpec This option requires externally handled HTTPS support (i.e. via proxy)
*/
public TelegramBotsApi(String externalUrl, String internalUrl) throws TelegramApiRequestException {
if (externalUrl == null || externalUrl.isEmpty()) {
throw new TelegramApiRequestException("Parameter externalUrl can not be null or empty");
}
if (internalUrl == null || internalUrl.isEmpty()) {
throw new TelegramApiRequestException("Parameter internalUrl can not be null or empty");
}
this.useWebhook = true;
this.extrenalUrl = fixExternalUrl(externalUrl);
webhook = ApiContext.getInstance(Webhook.class);
webhook.setInternalUrl(internalUrl);
webhook.startServer();
}
/**
* Creates an HTTPS server to receive webhook request
* @param keyStore KeyStore for the server * @param keyStore KeyStore for the server
* @param keyStorePassword Key store password for the server * @param keyStorePassword Key store password for the server
* @param externalUrl External base url for the webhook * @param externalUrl External base url for the webhook
@ -41,6 +63,12 @@ public class TelegramBotsApi {
if (internalUrl == null || internalUrl.isEmpty()) { if (internalUrl == null || internalUrl.isEmpty()) {
throw new TelegramApiRequestException("Parameter internalUrl can not be null or empty"); throw new TelegramApiRequestException("Parameter internalUrl can not be null or empty");
} }
if (keyStore == null || keyStore.isEmpty()) {
throw new TelegramApiRequestException("Parameter keyStore can not be null or empty");
}
if (keyStorePassword == null || keyStorePassword.isEmpty()) {
throw new TelegramApiRequestException("Parameter keyStorePassword can not be null or empty");
}
this.useWebhook = true; this.useWebhook = true;
this.extrenalUrl = fixExternalUrl(externalUrl); this.extrenalUrl = fixExternalUrl(externalUrl);
@ -51,7 +79,7 @@ public class TelegramBotsApi {
} }
/** /**
* * Creates an HTTPS server with self-signed certificate to receive webhook request
* @param keyStore KeyStore for the server * @param keyStore KeyStore for the server
* @param keyStorePassword Key store password for the server * @param keyStorePassword Key store password for the server
* @param externalUrl External base url for the webhook * @param externalUrl External base url for the webhook
@ -65,6 +93,16 @@ public class TelegramBotsApi {
if (internalUrl == null || internalUrl.isEmpty()) { if (internalUrl == null || internalUrl.isEmpty()) {
throw new TelegramApiRequestException("Parameter internalUrl can not be null or empty"); throw new TelegramApiRequestException("Parameter internalUrl can not be null or empty");
} }
if (keyStore == null || keyStore.isEmpty()) {
throw new TelegramApiRequestException("Parameter keyStore can not be null or empty");
}
if (keyStorePassword == null || keyStorePassword.isEmpty()) {
throw new TelegramApiRequestException("Parameter keyStorePassword can not be null or empty");
}
if (pathToCertificate == null || pathToCertificate.isEmpty()) {
throw new TelegramApiRequestException("Parameter pathToCertificate can not be null or empty");
}
this.useWebhook = true; this.useWebhook = true;
this.extrenalUrl = fixExternalUrl(externalUrl); this.extrenalUrl = fixExternalUrl(externalUrl);
this.pathToCertificate = pathToCertificate; this.pathToCertificate = pathToCertificate;

22
telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/BotSession.java
View File

@ -10,7 +10,27 @@ public interface BotSession {
void setOptions(BotOptions options); void setOptions(BotOptions options);
void setToken(String token); void setToken(String token);
void setCallback(LongPollingBot callback); void setCallback(LongPollingBot callback);
/**
* Starts the bot
*/
void start(); void start();
void close();
/**
* Stops the bot
*/
void stop();
/**
* Check if the bot is running
* @return True if the bot is running, false otherwise
*/
boolean isRunning(); boolean isRunning();
/**
* @deprecated Use @link{{@link #stop()}} instead
*/
default void close() {
this.stop();
}
} }

29
telegrambots-meta/src/test/java/org/telegram/telegrambots/TestTelegramApi.java
View File

@ -1,29 +0,0 @@
package org.telegram.telegrambots;
import org.junit.Assert;
import org.junit.Test;
import org.telegram.telegrambots.base.TestBase;
import org.telegram.telegrambots.exceptions.TelegramApiRequestException;
/**
* @author Ruben Bermudez
* @version 1.0
* @brief TODO
* @date 29 of October of 2016
*/
public class TestTelegramApi extends TestBase {
@Test
public void TestTelegramApiMustBeInitializableForLongPolling() {
new TelegramBotsApi();
}
@Test
public void TestTelegramApiMustBeInitializableForWebhook() {
try {
new TelegramBotsApi("keyStore", "keyStorePassword", "externalUrl", "internalUrl");
} catch (TelegramApiRequestException e) {
Assert.fail();
}
}
}

2
telegrambots-meta/src/test/java/org/telegram/telegrambots/TelegramBotsHelper.java → telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TelegramBotsHelper.java
View File

@ -1,4 +1,4 @@
package org.telegram.telegrambots; package org.telegram.telegrambots.test;
/** /**
* @author Ruben Bermudez * @author Ruben Bermudez

2
telegrambots-meta/src/test/java/org/telegram/telegrambots/TestDeserialization.java → telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TestDeserialization.java
View File

@ -1,4 +1,4 @@
package org.telegram.telegrambots; package org.telegram.telegrambots.test;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;

48
telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TestTelegramApi.java Normal file
View File

@ -0,0 +1,48 @@
package org.telegram.telegrambots.test;
import org.junit.Assert;
import org.junit.Test;
import org.telegram.telegrambots.TelegramBotsApi;
import org.telegram.telegrambots.test.base.TestBase;
import org.telegram.telegrambots.exceptions.TelegramApiRequestException;
/**
* @author Ruben Bermudez
* @version 1.0
* @brief TODO
* @date 29 of October of 2016
*/
public class TestTelegramApi extends TestBase {
@Test
public void TestTelegramApiMustBeInitializableForLongPolling() {
new TelegramBotsApi();
}
@Test
public void TestTelegramApiMustBeInitializableForWebhookWithoutSecureSupport() {
try {
new TelegramBotsApi("externalUrl", "internalUrl");
} catch (TelegramApiRequestException e) {
Assert.fail();
}
}
@Test
public void TestTelegramApiMustBeInitializableForWebhook() {
try {
new TelegramBotsApi("keyStore", "keyStorePassword", "externalUrl", "internalUrl");
} catch (TelegramApiRequestException e) {
Assert.fail();
}
}
@Test
public void TestTelegramApiMustBeInitializableForWebhookWithSelfSignedCertificate() {
try {
new TelegramBotsApi("keyStore", "keyStorePassword", "externalUrl", "internalUrl", "selfSignedPath");
} catch (TelegramApiRequestException e) {
Assert.fail();
}
}
}

4
telegrambots-meta/src/test/java/org/telegram/telegrambots/apimethods/TestGetUpdates.java → telegrambots-meta/src/test/java/org/telegram/telegrambots/test/apimethods/TestGetUpdates.java
View File

@ -1,11 +1,11 @@
package org.telegram.telegrambots.apimethods; package org.telegram.telegrambots.test.apimethods;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.telegram.telegrambots.TelegramBotsHelper; import org.telegram.telegrambots.test.TelegramBotsHelper;
import org.telegram.telegrambots.api.methods.updates.GetUpdates; import org.telegram.telegrambots.api.methods.updates.GetUpdates;
import org.telegram.telegrambots.api.objects.Update; import org.telegram.telegrambots.api.objects.Update;
import org.telegram.telegrambots.exceptions.TelegramApiRequestException; import org.telegram.telegrambots.exceptions.TelegramApiRequestException;

4
telegrambots-meta/src/test/java/org/telegram/telegrambots/apimethods/TestSetGameScore.java → telegrambots-meta/src/test/java/org/telegram/telegrambots/test/apimethods/TestSetGameScore.java
View File

@ -1,11 +1,11 @@
package org.telegram.telegrambots.apimethods; package org.telegram.telegrambots.test.apimethods;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.telegram.telegrambots.TelegramBotsHelper; import org.telegram.telegrambots.test.TelegramBotsHelper;
import org.telegram.telegrambots.api.methods.games.SetGameScore; import org.telegram.telegrambots.api.methods.games.SetGameScore;
import org.telegram.telegrambots.api.objects.Message; import org.telegram.telegrambots.api.objects.Message;

2
telegrambots-meta/src/test/java/org/telegram/telegrambots/asserts/ApiAssert.java → telegrambots-meta/src/test/java/org/telegram/telegrambots/test/asserts/ApiAssert.java
View File

@ -1,4 +1,4 @@
package org.telegram.telegrambots.asserts; package org.telegram.telegrambots.test.asserts;
/** /**
* @author Ruben Bermudez * @author Ruben Bermudez

6
telegrambots-meta/src/test/java/org/telegram/telegrambots/base/TestBase.java → telegrambots-meta/src/test/java/org/telegram/telegrambots/test/base/TestBase.java
View File

@ -1,9 +1,9 @@
package org.telegram.telegrambots.base; package org.telegram.telegrambots.test.base;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.telegram.telegrambots.ApiContext; import org.telegram.telegrambots.ApiContext;
import org.telegram.telegrambots.fakes.FakeBotSession; import org.telegram.telegrambots.test.fakes.FakeBotSession;
import org.telegram.telegrambots.fakes.FakeWebhook; import org.telegram.telegrambots.test.fakes.FakeWebhook;
import org.telegram.telegrambots.generics.BotSession; import org.telegram.telegrambots.generics.BotSession;
import org.telegram.telegrambots.generics.Webhook; import org.telegram.telegrambots.generics.Webhook;

4
telegrambots-meta/src/test/java/org/telegram/telegrambots/fakes/FakeBotSession.java → telegrambots-meta/src/test/java/org/telegram/telegrambots/test/fakes/FakeBotSession.java
View File

@ -1,4 +1,4 @@
package org.telegram.telegrambots.fakes; package org.telegram.telegrambots.test.fakes;
import org.telegram.telegrambots.generics.BotOptions; import org.telegram.telegrambots.generics.BotOptions;
import org.telegram.telegrambots.generics.BotSession; import org.telegram.telegrambots.generics.BotSession;
@ -27,7 +27,7 @@ public class FakeBotSession implements BotSession {
} }
@Override @Override
public void close() { public void stop() {
} }

2
telegrambots-meta/src/test/java/org/telegram/telegrambots/fakes/FakeWebhook.java → telegrambots-meta/src/test/java/org/telegram/telegrambots/test/fakes/FakeWebhook.java
View File

@ -1,4 +1,4 @@
package org.telegram.telegrambots.fakes; package org.telegram.telegrambots.test.fakes;
import org.telegram.telegrambots.exceptions.TelegramApiRequestException; import org.telegram.telegrambots.exceptions.TelegramApiRequestException;
import org.telegram.telegrambots.generics.Webhook; import org.telegram.telegrambots.generics.Webhook;

16
telegrambots/pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.telegram</groupId> <groupId>org.telegram</groupId>
<artifactId>telegrambots</artifactId> <artifactId>telegrambots</artifactId>
<version>2.4.4.1</version> <version>2.4.4.3</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Telegram Bots</name> <name>Telegram Bots</name>
@ -59,13 +59,13 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<glassfish.version>2.24</glassfish.version> <glassfish.version>2.25</glassfish.version>
<jerseybundle.version>1.19.3</jerseybundle.version> <jerseybundle.version>1.19.3</jerseybundle.version>
<httpcompontents.version>4.5.2</httpcompontents.version> <httpcompontents.version>4.5.2</httpcompontents.version>
<json.version>20160810</json.version> <json.version>20160810</json.version>
<jackson.version>2.8.5</jackson.version> <jackson.version>2.8.5</jackson.version>
<commonio.version>2.5</commonio.version> <commonio.version>2.5</commonio.version>
<bots.version>2.4.4.1</bots.version> <bots.version>2.4.4.3</bots.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -135,13 +135,19 @@
<dependency> <dependency>
<groupId>org.glassfish.jersey.test-framework</groupId> <groupId>org.glassfish.jersey.test-framework</groupId>
<artifactId>jersey-test-framework-core</artifactId> <artifactId>jersey-test-framework-core</artifactId>
<version>2.24</version> <version>${glassfish.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId> <groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-grizzly2</artifactId> <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
<version>2.24</version> <version>${glassfish.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>2.0.2-beta</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

38
telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java
View File

@ -39,11 +39,10 @@ import java.util.concurrent.TimeUnit;
/** /**
* @author Ruben Bermudez * @author Ruben Bermudez
* @version 1.0 * @version 1.0
* @brief Thread to request updates with active wait * Thread to request updates with active wait
* @date 20 of June of 2015
*/ */
public class DefaultBotSession implements BotSession { public class DefaultBotSession implements BotSession {
protected static final String LOGTAG = "BOTSESSION"; private static final String LOGTAG = "BOTSESSION";
private volatile boolean running = false; private volatile boolean running = false;
@ -62,34 +61,40 @@ public class DefaultBotSession implements BotSession {
} }
@Override @Override
public void start() { public synchronized void start() {
if (running) { if (running) {
throw new IllegalStateException("Session already running"); throw new IllegalStateException("Session already running");
} }
running = true; running = true;
if (readerThread == null || readerThread.isInterrupted()) {
readerThread = new ReaderThread(); lastReceivedUpdate = 0;
readerThread.setName(callback.getBotUsername() + " Telegram Connection");
} readerThread = new ReaderThread();
readerThread.setName(callback.getBotUsername() + " Telegram Connection");
readerThread.start(); readerThread.start();
if (handlerThread == null || handlerThread.isInterrupted()) { handlerThread = new HandlerThread();
handlerThread = new HandlerThread(); handlerThread.setName(callback.getBotUsername() + " Telegram Executor");
handlerThread.setName(callback.getBotUsername() + " Telegram Executor");
}
handlerThread.start(); handlerThread.start();
} }
@Override @Override
public void close() { public synchronized void stop() {
if (!running) {
throw new IllegalStateException("Session already stopped");
}
running = false; running = false;
if (readerThread != null) { if (readerThread != null) {
readerThread.interrupt(); readerThread.interrupt();
} }
if (handlerThread != null) { if (handlerThread != null) {
handlerThread.interrupt(); handlerThread.interrupt();
} }
if (callback != null) { if (callback != null) {
callback.onClosing(); callback.onClosing();
} }
@ -120,7 +125,7 @@ public class DefaultBotSession implements BotSession {
} }
@Override @Override
public boolean isRunning() { public synchronized boolean isRunning() {
return running; return running;
} }
@ -130,15 +135,14 @@ public class DefaultBotSession implements BotSession {
@Override @Override
public synchronized void start() { public synchronized void start() {
super.start();
httpclient = HttpClientBuilder.create() httpclient = HttpClientBuilder.create()
.setSSLHostnameVerifier(new NoopHostnameVerifier()) .setSSLHostnameVerifier(new NoopHostnameVerifier())
.setConnectionTimeToLive(70, TimeUnit.SECONDS) .setConnectionTimeToLive(70, TimeUnit.SECONDS)
.setMaxConnTotal(100) .setMaxConnTotal(100)
.build(); .build();
requestConfig = options.getRequestConfig(); requestConfig = options.getRequestConfig();
super.start();
} }
@Override @Override

26
telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultWebhook.java
View File

@ -49,20 +49,24 @@ public class DefaultWebhook implements Webhook {
} }
public void startServer() throws TelegramApiRequestException { public void startServer() throws TelegramApiRequestException {
SSLContextConfigurator sslContext = new SSLContextConfigurator();
// set up security context
sslContext.setKeyStoreFile(keystoreServerFile); // contains server keypair
sslContext.setKeyStorePass(keystoreServerPwd);
ResourceConfig rc = new ResourceConfig(); ResourceConfig rc = new ResourceConfig();
rc.register(restApi); rc.register(restApi);
rc.register(JacksonFeature.class); rc.register(JacksonFeature.class);
final HttpServer grizzlyServer = GrizzlyHttpServerFactory.createHttpServer(
getBaseURI(), final HttpServer grizzlyServer;
rc, if (keystoreServerFile != null && keystoreServerPwd != null) {
true, SSLContextConfigurator sslContext = new SSLContextConfigurator();
new SSLEngineConfigurator(sslContext).setClientMode(false).setNeedClientAuth(false));
// set up security context
sslContext.setKeyStoreFile(keystoreServerFile); // contains server keypair
sslContext.setKeyStorePass(keystoreServerPwd);
grizzlyServer = GrizzlyHttpServerFactory.createHttpServer(getBaseURI(), rc, true,
new SSLEngineConfigurator(sslContext).setClientMode(false).setNeedClientAuth(false));
} else {
grizzlyServer = GrizzlyHttpServerFactory.createHttpServer(getBaseURI(), rc);
}
try { try {
grizzlyServer.start(); grizzlyServer.start();
} catch (IOException e) { } catch (IOException e) {

18
telegrambots/src/test/java/org/telegram/telegrambots/TestDefaultBotSession.java
View File

@ -1,18 +0,0 @@
package org.telegram.telegrambots;
import org.junit.Assert;
import org.junit.Test;
import org.telegram.telegrambots.updatesreceivers.DefaultBotSession;
/**
* @author Ruben Bermudez
* @version 1.0
* @brief TODO
* @date 07 of November of 2016
*/
public class TestDefaultBotSession {
@Test
public void TestDefaultBotSessionIsNotRunninWhenCreated() throws Exception {
Assert.assertFalse(new DefaultBotSession().isRunning());
}
}

2
telegrambots/src/test/java/org/telegram/telegrambots/BotApiMethodHelperFactory.java → telegrambots/src/test/java/org/telegram/telegrambots/test/BotApiMethodHelperFactory.java
View File

@ -1,4 +1,4 @@
package org.telegram.telegrambots; package org.telegram.telegrambots.test;
import org.telegram.telegrambots.api.methods.ActionType; import org.telegram.telegrambots.api.methods.ActionType;
import org.telegram.telegrambots.api.methods.AnswerCallbackQuery; import org.telegram.telegrambots.api.methods.AnswerCallbackQuery;

39
telegrambots/src/test/java/org/telegram/telegrambots/test/Fakes/FakeLongPollingBot.java Normal file
View File

@ -0,0 +1,39 @@
package org.telegram.telegrambots.test.Fakes;
import org.telegram.telegrambots.api.objects.Update;
import org.telegram.telegrambots.bots.DefaultBotOptions;
import org.telegram.telegrambots.exceptions.TelegramApiRequestException;
import org.telegram.telegrambots.generics.BotOptions;
import org.telegram.telegrambots.generics.LongPollingBot;
/**
* @author Ruben Bermudez
* @version 1.0
*/
public class FakeLongPollingBot implements LongPollingBot
{
@Override
public void onUpdateReceived(Update update) {
}
@Override
public String getBotUsername() {
return "";
}
@Override
public String getBotToken() {
return "";
}
@Override
public BotOptions getOptions() {
return new DefaultBotOptions();
}
@Override
public void clearWebhook() throws TelegramApiRequestException {
}
}

4
telegrambots/src/test/java/org/telegram/telegrambots/Fakes/FakeWebhook.java → telegrambots/src/test/java/org/telegram/telegrambots/test/Fakes/FakeWebhook.java
View File

@ -1,4 +1,4 @@
package org.telegram.telegrambots.Fakes; package org.telegram.telegrambots.test.Fakes;
import org.telegram.telegrambots.api.methods.BotApiMethod; import org.telegram.telegrambots.api.methods.BotApiMethod;
import org.telegram.telegrambots.api.objects.Update; import org.telegram.telegrambots.api.objects.Update;
@ -8,8 +8,6 @@ import org.telegram.telegrambots.generics.WebhookBot;
/** /**
* @author Ruben Bermudez * @author Ruben Bermudez
* @version 1.0 * @version 1.0
* @brief TODO
* @date 01 of November of 2016
*/ */
public class FakeWebhook implements WebhookBot { public class FakeWebhook implements WebhookBot {
private BotApiMethod returnValue; private BotApiMethod returnValue;

96
telegrambots/src/test/java/org/telegram/telegrambots/test/TestDefaultBotSession.java Normal file
View File

@ -0,0 +1,96 @@
package org.telegram.telegrambots.test;
import org.apache.http.HttpResponse;
import org.apache.http.ProtocolVersion;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.message.BasicHttpResponse;
import org.apache.http.message.BasicStatusLine;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import org.telegram.telegrambots.bots.DefaultBotOptions;
import org.telegram.telegrambots.test.Fakes.FakeLongPollingBot;
import org.telegram.telegrambots.updatesreceivers.DefaultBotSession;
import java.io.IOException;
/**
* @author Ruben Bermudez
* @version 1.0
* @brief Test for DefaultBotSession
*/
public class TestDefaultBotSession {
DefaultBotSession session;
@Before
public void setUp() throws Exception {
session = getDefaultBotSession();
}
@After
public void tearDown() throws Exception {
if (session != null && session.isRunning()) {
session.stop();
}
}
@Test
public void TestDefaultBotSessionIsNotRunningWhenCreated() throws Exception {
Assert.assertFalse(session.isRunning());
}
@Test
public void TestDefaultBotSessionCanBeStartedAfterCreation() throws Exception {
session = getDefaultBotSession();
session.start();
Assert.assertTrue(session.isRunning());
}
@Test(expected = IllegalStateException.class)
public void TestDefaultBotSessionCanNotBeStoppedAfterCreation() throws Exception {
session = getDefaultBotSession();
session.stop();
}
@Test(expected = IllegalStateException.class)
public void TestDefaultBotSessionCanNotBeStartedIfAlreadyStarted() throws Exception {
session = getDefaultBotSession();
session.start();
session.start();
}
@Test
public void TestDefaultBotSessionCanBeStoppedIfStarted() throws Exception {
session = getDefaultBotSession();
session.start();
session.stop();
Assert.assertFalse(session.isRunning());
}
@Test(expected = IllegalStateException.class)
public void TestDefaultBotSessionCanNotBeStoppedIfAlreadyStopped() throws Exception {
session = getDefaultBotSession();
session.start();
session.stop();
session.stop();
}
private DefaultBotSession getDefaultBotSession() throws IOException {
HttpResponse response = new BasicHttpResponse(new BasicStatusLine(
new ProtocolVersion("HTTP", 1, 1), 200, ""));
response.setStatusCode(200);
response.setEntity(new StringEntity("{}"));
HttpClient mockHttpClient = Mockito.mock(HttpClient.class);
Mockito.when(mockHttpClient.execute(Mockito.any(HttpPost.class)))
.thenReturn(response);
DefaultBotSession session = new DefaultBotSession();
session.setCallback(new FakeLongPollingBot());
session.setOptions(new DefaultBotOptions());
return session;
}
}

31
telegrambots/src/test/java/org/telegram/telegrambots/TestRestApi.java → telegrambots/src/test/java/org/telegram/telegrambots/test/TestRestApi.java
View File

@ -1,48 +1,29 @@
package org.telegram.telegrambots; package org.telegram.telegrambots.test;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.glassfish.jersey.jackson.JacksonFeature; import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest; import org.glassfish.jersey.test.JerseyTest;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.telegram.telegrambots.Fakes.FakeWebhook; import org.telegram.telegrambots.api.methods.*;
import org.telegram.telegrambots.api.methods.AnswerCallbackQuery;
import org.telegram.telegrambots.api.methods.AnswerInlineQuery;
import org.telegram.telegrambots.api.methods.BotApiMethod;
import org.telegram.telegrambots.api.methods.ForwardMessage;
import org.telegram.telegrambots.api.methods.GetFile;
import org.telegram.telegrambots.api.methods.GetMe;
import org.telegram.telegrambots.api.methods.GetUserProfilePhotos;
import org.telegram.telegrambots.api.methods.games.GetGameHighScores; import org.telegram.telegrambots.api.methods.games.GetGameHighScores;
import org.telegram.telegrambots.api.methods.games.SetGameScore; import org.telegram.telegrambots.api.methods.games.SetGameScore;
import org.telegram.telegrambots.api.methods.groupadministration.GetChat; import org.telegram.telegrambots.api.methods.groupadministration.*;
import org.telegram.telegrambots.api.methods.groupadministration.GetChatAdministrators; import org.telegram.telegrambots.api.methods.send.*;
import org.telegram.telegrambots.api.methods.groupadministration.GetChatMember;
import org.telegram.telegrambots.api.methods.groupadministration.GetChatMemberCount;
import org.telegram.telegrambots.api.methods.groupadministration.KickChatMember;
import org.telegram.telegrambots.api.methods.groupadministration.LeaveChat;
import org.telegram.telegrambots.api.methods.groupadministration.UnbanChatMember;
import org.telegram.telegrambots.api.methods.send.SendChatAction;
import org.telegram.telegrambots.api.methods.send.SendContact;
import org.telegram.telegrambots.api.methods.send.SendGame;
import org.telegram.telegrambots.api.methods.send.SendLocation;
import org.telegram.telegrambots.api.methods.send.SendMessage;
import org.telegram.telegrambots.api.methods.send.SendVenue;
import org.telegram.telegrambots.api.methods.updates.GetWebhookInfo; import org.telegram.telegrambots.api.methods.updates.GetWebhookInfo;
import org.telegram.telegrambots.api.methods.updatingmessages.EditMessageCaption; import org.telegram.telegrambots.api.methods.updatingmessages.EditMessageCaption;
import org.telegram.telegrambots.api.methods.updatingmessages.EditMessageReplyMarkup; import org.telegram.telegrambots.api.methods.updatingmessages.EditMessageReplyMarkup;
import org.telegram.telegrambots.api.methods.updatingmessages.EditMessageText; import org.telegram.telegrambots.api.methods.updatingmessages.EditMessageText;
import org.telegram.telegrambots.api.objects.Update; import org.telegram.telegrambots.api.objects.Update;
import org.telegram.telegrambots.test.Fakes.FakeWebhook;
import org.telegram.telegrambots.updatesreceivers.RestApi; import org.telegram.telegrambots.updatesreceivers.RestApi;
import java.io.IOException;
import javax.ws.rs.client.Entity; import javax.ws.rs.client.Entity;
import javax.ws.rs.core.Application; import javax.ws.rs.core.Application;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import java.io.IOException;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;