Skip to content

Commit 24a3b83

Browse files
committed
Normalizing line endings to .gitattributes file
1 parent 2d147d9 commit 24a3b83

File tree

132 files changed

+13310
-13441
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+13310
-13441
lines changed

.gitattributes

Lines changed: 47 additions & 178 deletions
Original file line numberDiff line numberDiff line change
@@ -1,178 +1,47 @@
1-
* text=auto !eol
2-
java/README.md -text
3-
java/build.gradle -text
4-
java/gradle.properties -text
5-
java/gradle/wrapper/gradle-wrapper.jar -text
6-
java/gradle/wrapper/gradle-wrapper.properties -text
7-
java/gradlew -text
8-
java/gradlew.bat -text
9-
java/settings.gradle -text
10-
java/src/META-INF/services/java.sql.Driver -text
11-
java/src/log4j.xml -text
12-
java/src/org/labkey/remoteapi/ApiKeyCredentialsProvider.java -text
13-
java/src/org/labkey/remoteapi/ApiVersionException.java -text
14-
java/src/org/labkey/remoteapi/BasicAuthCredentialsProvider.java -text
15-
java/src/org/labkey/remoteapi/Command.java -text
16-
java/src/org/labkey/remoteapi/CommandException.java -text
17-
java/src/org/labkey/remoteapi/CommandResponse.java -text
18-
java/src/org/labkey/remoteapi/Connection.java -text
19-
java/src/org/labkey/remoteapi/CredentialsProvider.java -text
20-
java/src/org/labkey/remoteapi/GuestCredentialsProvider.java -text
21-
java/src/org/labkey/remoteapi/NetrcCredentialsProvider.java -text
22-
java/src/org/labkey/remoteapi/NetrcFileParser.java -text
23-
java/src/org/labkey/remoteapi/PostCommand.java -text
24-
java/src/org/labkey/remoteapi/ResponseObject.java -text
25-
java/src/org/labkey/remoteapi/assay/AssayListCommand.java -text
26-
java/src/org/labkey/remoteapi/assay/AssayListResponse.java -text
27-
java/src/org/labkey/remoteapi/assay/Batch.java -text
28-
java/src/org/labkey/remoteapi/assay/Data.java -text
29-
java/src/org/labkey/remoteapi/assay/ExpObject.java -text
30-
java/src/org/labkey/remoteapi/assay/GetAssayRunCommand.java -text
31-
java/src/org/labkey/remoteapi/assay/GetAssayRunResponse.java -text
32-
java/src/org/labkey/remoteapi/assay/GetProtocolCommand.java -text
33-
java/src/org/labkey/remoteapi/assay/ImportRunCommand.java -text
34-
java/src/org/labkey/remoteapi/assay/ImportRunResponse.java -text
35-
java/src/org/labkey/remoteapi/assay/LoadAssayBatchCommand.java -text
36-
java/src/org/labkey/remoteapi/assay/LoadAssayBatchResponse.java -text
37-
java/src/org/labkey/remoteapi/assay/Material.java -text
38-
java/src/org/labkey/remoteapi/assay/Protocol.java -text
39-
java/src/org/labkey/remoteapi/assay/ProtocolResponse.java -text
40-
java/src/org/labkey/remoteapi/assay/Run.java -text
41-
java/src/org/labkey/remoteapi/assay/SaveAssayBatchCommand.java -text
42-
java/src/org/labkey/remoteapi/assay/SaveAssayBatchResponse.java -text
43-
java/src/org/labkey/remoteapi/assay/SaveAssayRunsCommand.java -text
44-
java/src/org/labkey/remoteapi/assay/SaveAssayRunsResponse.java -text
45-
java/src/org/labkey/remoteapi/assay/SaveProtocolCommand.java -text
46-
java/src/org/labkey/remoteapi/assay/nab/NAbRunsCommand.java -text
47-
java/src/org/labkey/remoteapi/assay/nab/NAbRunsResponse.java -text
48-
java/src/org/labkey/remoteapi/assay/nab/model/NAbCurveParameters.java -text
49-
java/src/org/labkey/remoteapi/assay/nab/model/NAbNeutralizationResult.java -text
50-
java/src/org/labkey/remoteapi/assay/nab/model/NAbReplicate.java -text
51-
java/src/org/labkey/remoteapi/assay/nab/model/NAbRun.java -text
52-
java/src/org/labkey/remoteapi/assay/nab/model/NAbSample.java -text
53-
java/src/org/labkey/remoteapi/assay/nab/model/NAbWell.java -text
54-
java/src/org/labkey/remoteapi/assay/nab/model/NAbWellGroup.java -text
55-
java/src/org/labkey/remoteapi/collections/CaseInsensitiveHashMap.java -text
56-
java/src/org/labkey/remoteapi/di/BaseTransformCommand.java -text
57-
java/src/org/labkey/remoteapi/di/BaseTransformResponse.java -text
58-
java/src/org/labkey/remoteapi/di/ResetTransformStateCommand.java -text
59-
java/src/org/labkey/remoteapi/di/ResetTransformStateResponse.java -text
60-
java/src/org/labkey/remoteapi/di/RunTransformCommand.java -text
61-
java/src/org/labkey/remoteapi/di/RunTransformResponse.java -text
62-
java/src/org/labkey/remoteapi/di/UpdateTransformConfigurationCommand.java -text
63-
java/src/org/labkey/remoteapi/di/UpdateTransformConfigurationResponse.java -text
64-
java/src/org/labkey/remoteapi/domain/AbstractDomainUpdateCommand.java -text
65-
java/src/org/labkey/remoteapi/domain/CreateDomainCommand.java -text
66-
java/src/org/labkey/remoteapi/domain/Domain.java -text
67-
java/src/org/labkey/remoteapi/domain/DomainResponse.java -text
68-
java/src/org/labkey/remoteapi/domain/DropDomainCommand.java -text
69-
java/src/org/labkey/remoteapi/domain/GetDomainCommand.java -text
70-
java/src/org/labkey/remoteapi/domain/ListDomainsCommand.java -text
71-
java/src/org/labkey/remoteapi/domain/ListDomainsResponse.java -text
72-
java/src/org/labkey/remoteapi/domain/PropertyDescriptor.java -text
73-
java/src/org/labkey/remoteapi/domain/SaveDomainCommand.java -text
74-
java/src/org/labkey/remoteapi/experiment/LineageCommand.java -text
75-
java/src/org/labkey/remoteapi/experiment/LineageNode.java -text
76-
java/src/org/labkey/remoteapi/experiment/LineageResponse.java -text
77-
java/src/org/labkey/remoteapi/ms2/StartSearchCommand.java -text
78-
java/src/org/labkey/remoteapi/ms2/StartSearchResponse.java -text
79-
java/src/org/labkey/remoteapi/pipeline/FileNotificationCommand.java -text
80-
java/src/org/labkey/remoteapi/pipeline/FileNotificationResponse.java -text
81-
java/src/org/labkey/remoteapi/query/BaseQueryCommand.java -text
82-
java/src/org/labkey/remoteapi/query/BaseSelect.java -text
83-
java/src/org/labkey/remoteapi/query/ContainerFilter.java -text
84-
java/src/org/labkey/remoteapi/query/DateParser.java -text
85-
java/src/org/labkey/remoteapi/query/DeleteRowsCommand.java -text
86-
java/src/org/labkey/remoteapi/query/ExecuteSqlCommand.java -text
87-
java/src/org/labkey/remoteapi/query/Filter.java -text
88-
java/src/org/labkey/remoteapi/query/GetQueriesCommand.java -text
89-
java/src/org/labkey/remoteapi/query/GetQueriesResponse.java -text
90-
java/src/org/labkey/remoteapi/query/GetQueryDetailsCommand.java -text
91-
java/src/org/labkey/remoteapi/query/GetQueryDetailsResponse.java -text
92-
java/src/org/labkey/remoteapi/query/GetSchemasCommand.java -text
93-
java/src/org/labkey/remoteapi/query/GetSchemasResponse.java -text
94-
java/src/org/labkey/remoteapi/query/ImportDataCommand.java -text
95-
java/src/org/labkey/remoteapi/query/ImportDataResponse.java -text
96-
java/src/org/labkey/remoteapi/query/InsertRowsCommand.java -text
97-
java/src/org/labkey/remoteapi/query/Row.java -text
98-
java/src/org/labkey/remoteapi/query/RowMap.java -text
99-
java/src/org/labkey/remoteapi/query/RowsResponse.java -text
100-
java/src/org/labkey/remoteapi/query/RowsResponseRowset.java -text
101-
java/src/org/labkey/remoteapi/query/Rowset.java -text
102-
java/src/org/labkey/remoteapi/query/SaveRowsCommand.java -text
103-
java/src/org/labkey/remoteapi/query/SaveRowsResponse.java -text
104-
java/src/org/labkey/remoteapi/query/SelectRowsCommand.java -text
105-
java/src/org/labkey/remoteapi/query/SelectRowsResponse.java -text
106-
java/src/org/labkey/remoteapi/query/Sort.java -text
107-
java/src/org/labkey/remoteapi/query/SqlExecuteCommand.java -text
108-
java/src/org/labkey/remoteapi/query/TruncateTableCommand.java -text
109-
java/src/org/labkey/remoteapi/query/TruncateTableResponse.java -text
110-
java/src/org/labkey/remoteapi/query/UpdateRowsCommand.java -text
111-
java/src/org/labkey/remoteapi/sas/Main.java -text
112-
java/src/org/labkey/remoteapi/sas/SASBaseSelectCommand.java -text
113-
java/src/org/labkey/remoteapi/sas/SASConnection.java -text
114-
java/src/org/labkey/remoteapi/sas/SASDeleteRowsCommand.java -text
115-
java/src/org/labkey/remoteapi/sas/SASExecuteSqlCommand.java -text
116-
java/src/org/labkey/remoteapi/sas/SASInsertRowsCommand.java -text
117-
java/src/org/labkey/remoteapi/sas/SASRow.java -text
118-
java/src/org/labkey/remoteapi/sas/SASSaveRowsCommand.java -text
119-
java/src/org/labkey/remoteapi/sas/SASSaveRowsResponse.java -text
120-
java/src/org/labkey/remoteapi/sas/SASSelectRowsCommand.java -text
121-
java/src/org/labkey/remoteapi/sas/SASSelectRowsResponse.java -text
122-
java/src/org/labkey/remoteapi/sas/SASUpdateRowsCommand.java -text
123-
java/src/org/labkey/remoteapi/security/ACL.java -text
124-
java/src/org/labkey/remoteapi/security/AddGroupMembersCommand.java -text
125-
java/src/org/labkey/remoteapi/security/CreateContainerCommand.java -text
126-
java/src/org/labkey/remoteapi/security/CreateContainerResponse.java -text
127-
java/src/org/labkey/remoteapi/security/CreateGroupCommand.java -text
128-
java/src/org/labkey/remoteapi/security/CreateGroupResponse.java -text
129-
java/src/org/labkey/remoteapi/security/CreateUserCommand.java -text
130-
java/src/org/labkey/remoteapi/security/CreateUserResponse.java -text
131-
java/src/org/labkey/remoteapi/security/DeleteContainerCommand.java -text
132-
java/src/org/labkey/remoteapi/security/DeleteContainerResponse.java -text
133-
java/src/org/labkey/remoteapi/security/DeleteGroupCommand.java -text
134-
java/src/org/labkey/remoteapi/security/DeleteUserCommand.java -text
135-
java/src/org/labkey/remoteapi/security/EnsureLoginCommand.java -text
136-
java/src/org/labkey/remoteapi/security/GetContainersCommand.java -text
137-
java/src/org/labkey/remoteapi/security/GetContainersResponse.java -text
138-
java/src/org/labkey/remoteapi/security/GetGroupPermsCommand.java -text
139-
java/src/org/labkey/remoteapi/security/GetGroupPermsResponse.java -text
140-
java/src/org/labkey/remoteapi/security/GetUsersCommand.java -text
141-
java/src/org/labkey/remoteapi/security/GetUsersResponse.java -text
142-
java/src/org/labkey/remoteapi/security/GroupMembersCommand.java -text
143-
java/src/org/labkey/remoteapi/security/ImpersonateUserCommand.java -text
144-
java/src/org/labkey/remoteapi/security/LogoutCommand.java -text
145-
java/src/org/labkey/remoteapi/security/RemoveGroupMembersCommand.java -text
146-
java/src/org/labkey/remoteapi/security/RenameGroupCommand.java -text
147-
java/src/org/labkey/remoteapi/security/RenameGroupResponse.java -text
148-
java/src/org/labkey/remoteapi/security/StopImpersonatingCommand.java -text
149-
java/src/org/labkey/remoteapi/security/WhoAmICommand.java -text
150-
java/src/org/labkey/remoteapi/security/WhoAmIResponse.java -text
151-
java/src/org/labkey/remoteapi/study/CheckForStudyReloadCommand.java -text
152-
java/src/org/labkey/remoteapi/study/ParticipantGroup.java -text
153-
java/src/org/labkey/remoteapi/study/UpdateParticipantGroupCommand.java -text
154-
java/src/org/labkey/remoteapi/study/UpdateParticipantGroupResponse.java -text
155-
java/src/org/labkey/remoteapi/test/ClientConfig.java -text
156-
java/src/org/labkey/remoteapi/test/Demo.java -text
157-
java/src/org/labkey/remoteapi/test/ImportRunDemo.java -text
158-
java/src/org/labkey/remoteapi/test/MS2SearchClient.java -text
159-
java/src/org/labkey/remoteapi/test/PipelineFileAvailableClient.java -text
160-
java/src/org/labkey/remoteapi/test/SaveAssayBatchDemo.java -text
161-
java/src/org/labkey/remoteapi/test/Test.java -text
162-
sas/MorePeople.xls -text
163-
sas/People.xls -text
164-
sas/build.gradle -text
165-
sas/deleteMacros.sas -text
166-
sas/demo.sas -text
167-
sas/macros/_labkeycreateconnection.sas -text
168-
sas/macros/_labkeyexceptiondescribe.sas -text
169-
sas/macros/_labkeysaverows.sas -text
170-
sas/macros/_labkeysendcommand.sas -text
171-
sas/macros/_labkeysharedselectrowshandling.sas -text
172-
sas/macros/labkeydeleterows.sas -text
173-
sas/macros/labkeyexecutesql.sas -text
174-
sas/macros/labkeyinsertrows.sas -text
175-
sas/macros/labkeymakefilter.sas -text
176-
sas/macros/labkeyselectrows.sas -text
177-
sas/macros/labkeysetdefaults.sas -text
178-
sas/macros/labkeyupdaterows.sas -text
1+
# Convert text files to OS line-endings on checkout, and LF on check-in
2+
* text=auto !eol
3+
4+
# Text files to convert
5+
*.css text diff=css
6+
*.htm text diff=html
7+
*.html text diff=html
8+
*.java text diff=java
9+
*.js text
10+
*.json text
11+
*.jsp text
12+
*.jspf text
13+
*.jspx text
14+
*.properties text
15+
*.py text diff=python
16+
*.sql text
17+
*.tld text
18+
*.ts text
19+
*.txt text
20+
*.xml text
21+
*.yml text
22+
23+
# Keep unix endings
24+
*.bash text eol=lf
25+
*.sh text eol=lf
26+
27+
# Keep Windows endings
28+
*.bat text eol=crlf
29+
*.cmd text eol=crlf
30+
31+
# Known binary files -- Don't change (binary is a macro for -text -diff)
32+
*.bin binary
33+
*.class binary
34+
*.dll binary
35+
*.ear binary
36+
*.exe binary
37+
*.gif binary
38+
*.gz binary
39+
*.ico binary
40+
*.jar binary
41+
*.jpg binary
42+
*.jpeg binary
43+
*.png binary
44+
*.so binary
45+
*.tar binary
46+
*.war binary
47+
*.zip binary

java/README.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
##The LabKey Remote API Library for Java
2-
3-
Welcome to the LabKey Remote API library for Java. This library allows Java developers to access the data and services exposed from a LabKey Server installation.
4-
5-
For detailed information on the library, its classes, and programming interfaces, see the [JavaDoc](https://www.labkey.org/download/clientapi_docs/java-api/).
6-
7-
If you have any questions about this library or the LabKey Server, see our [Community Support Forums](https://www.labkey.org/wiki/home/page.view?name=support).
8-
9-
This library is licensed under the [Apache 2.0 open-source license](http://www.apache.org/licenses/LICENSE-2.0).
10-
11-
---
12-
13-
###Changes in version 1.0.0
14-
- Migration to [SemVer](https://semver.org/) for library versioning. With 1.0.0 we will move away from using the LabKey server version
15-
and adopt the standard used in our other API libraries. Version 1.0.0 will succeed the previous published version of : 19.1.0.
16-
- Support for truncating tables, there is a new TruncateTableCommand to expose this functionality.
17-
- CRUD operations for Domains.
18-
- Improved support for Assay data import. LoadAssayBatchCommand and SaveAssayRunCommand have been added to allow support for ad-hoc properties.
19-
- New ListDomainsCommand.
20-
- New SaveAssayRunsCommand.
21-
- Update PropertyDescriptor to expose missing value toggling.
1+
##The LabKey Remote API Library for Java
2+
3+
Welcome to the LabKey Remote API library for Java. This library allows Java developers to access the data and services exposed from a LabKey Server installation.
4+
5+
For detailed information on the library, its classes, and programming interfaces, see the [JavaDoc](https://www.labkey.org/download/clientapi_docs/java-api/).
6+
7+
If you have any questions about this library or the LabKey Server, see our [Community Support Forums](https://www.labkey.org/wiki/home/page.view?name=support).
8+
9+
This library is licensed under the [Apache 2.0 open-source license](http://www.apache.org/licenses/LICENSE-2.0).
10+
11+
---
12+
13+
###Changes in version 1.0.0
14+
- Migration to [SemVer](https://semver.org/) for library versioning. With 1.0.0 we will move away from using the LabKey server version
15+
and adopt the standard used in our other API libraries. Version 1.0.0 will succeed the previous published version of : 19.1.0.
16+
- Support for truncating tables, there is a new TruncateTableCommand to expose this functionality.
17+
- CRUD operations for Domains.
18+
- Improved support for Assay data import. LoadAssayBatchCommand and SaveAssayRunCommand have been added to allow support for ad-hoc properties.
19+
- New ListDomainsCommand.
20+
- New SaveAssayRunsCommand.
21+
- Update PropertyDescriptor to expose missing value toggling.

java/src/log4j.xml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
<?xml version="1.0" encoding="UTF-8" ?>
2-
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
3-
4-
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
5-
<appender name="console" class="org.apache.log4j.ConsoleAppender">
6-
<param name="Target" value="System.out"/>
7-
<layout class="org.apache.log4j.PatternLayout">
8-
<param name="ConversionPattern" value="%-5p %c{1} - %m%n"/>
9-
</layout>
10-
</appender>
11-
12-
<root>
13-
<priority value ="error" />
14-
<appender-ref ref="console" />
15-
</root>
16-
17-
</log4j:configuration>
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
3+
4+
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
5+
<appender name="console" class="org.apache.log4j.ConsoleAppender">
6+
<param name="Target" value="System.out"/>
7+
<layout class="org.apache.log4j.PatternLayout">
8+
<param name="ConversionPattern" value="%-5p %c{1} - %m%n"/>
9+
</layout>
10+
</appender>
11+
12+
<root>
13+
<priority value ="error" />
14+
<appender-ref ref="console" />
15+
</root>
16+
17+
</log4j:configuration>
Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
/*
2-
* Copyright (c) 2016 LabKey Corporation
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
16-
package org.labkey.remoteapi;
17-
18-
import org.apache.http.auth.AuthenticationException;
19-
import org.apache.http.client.methods.HttpUriRequest;
20-
import org.apache.http.client.protocol.HttpClientContext;
21-
22-
import java.net.URISyntaxException;
23-
24-
/**
25-
* Created by adam on 4/15/2016.
26-
*/
27-
public class ApiKeyCredentialsProvider implements CredentialsProvider
28-
{
29-
private final String _apiKey;
30-
31-
public ApiKeyCredentialsProvider(String apiKey)
32-
{
33-
_apiKey = apiKey;
34-
}
35-
36-
@Override
37-
public void configureRequest(String baseUrl, HttpUriRequest request, HttpClientContext httpClientContext) throws AuthenticationException, URISyntaxException
38-
{
39-
request.setHeader("apikey", _apiKey);
40-
}
41-
}
1+
/*
2+
* Copyright (c) 2016 LabKey Corporation
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.labkey.remoteapi;
17+
18+
import org.apache.http.auth.AuthenticationException;
19+
import org.apache.http.client.methods.HttpUriRequest;
20+
import org.apache.http.client.protocol.HttpClientContext;
21+
22+
import java.net.URISyntaxException;
23+
24+
/**
25+
* Created by adam on 4/15/2016.
26+
*/
27+
public class ApiKeyCredentialsProvider implements CredentialsProvider
28+
{
29+
private final String _apiKey;
30+
31+
public ApiKeyCredentialsProvider(String apiKey)
32+
{
33+
_apiKey = apiKey;
34+
}
35+
36+
@Override
37+
public void configureRequest(String baseUrl, HttpUriRequest request, HttpClientContext httpClientContext) throws AuthenticationException, URISyntaxException
38+
{
39+
request.setHeader("apikey", _apiKey);
40+
}
41+
}

0 commit comments

Comments
 (0)