git revert -m 1 <merge-commit>
With ‘-m 1’ we tell git to revert to the first parent of the mergecommit on the master branch. -m 2 would specify to revert to the first parent on the develop branch where the merge came from initially
(lieber vorher prüfen welcher branch welcher ist)
public class User implements Serializable {
//class attributes, constructors, setters and getters as shown above
/**
* Always treat de-serialization as a full-blown constructor, by validating the final state of the de-serialized object.
*/
private void readObject(ObjectInputStream aInputStream) throws ClassNotFoundException, IOException
{
// perform the default de-serialization first
aInputStream.defaultReadObject();
// make defensive copy of the mutable Date field
dateOpened = new Date(dateOpened.getTime());
// ensure that object state has not been corrupted or tampered with malicious code
//validateUserInfo();
}
/**
* This is the default implementation of writeObject. Customize as necessary.
*/
private void writeObject(ObjectOutputStream aOutputStream) throws IOException {
//ensure that object is in desired state. Possibly run any business rules if applicable.
//checkUserInfo();
// perform the default serialization for all non-transient, non-static fields
aOutputStream.defaultWriteObject();
}
}
def sample = ['Groovy', 'Gradle', 'Grails', 'Spock'] as String[]
def result = sample.stream() // Use stream() on array objects
.filter { s -> s.startsWith('Gr') }
.map { s -> s.toUpperCase() }
.toList() // toList() added to Stream by Groovy
Partial Indexes
A partial index is an index built over a subset of a table; the subset is defined by a conditional expression (called the predicate of the partial index). The index contains entries for only those table rows that satisfy the predicate.
CREATE INDEX access_log_client_ip_ix ON access_log (client_ip)
WHERE NOT (client_ip > inet '192.168.100.0' AND client_ip < inet '192.168.100.255');
sudo apt-get install libemail-outlook-message-perl libemail-sender-perl
from a command line. Use
msgconvert *.msg
to convert every file in a directory at once. MSGConvert will produce copies of your .msg-files with the suffix .msg.eml
REQUEST: Only when the request comes directly from the client
FORWARD: Only when the request has been forwarded to a component (see Transferring Control to Another Web Component)
INCLUDE: Only when the request is being processed by a component that has been included (see Including Other Resources in the Response)
ERROR: Only when the request is being processed with the error page mechanism (see Handling Servlet Errors)
You can direct the filter to be applied to any combination of the preceding situations by selecting multiple dispatcher types. If no types are specified, the default option is REQUEST.
For bureaucratic reasons, a colleague of mine had to print, sign, scan and send by email a high number of pages. To save trees, ink, time, and to stick it...
Extract the PKCS#7 object:
$ openssl smime -verify -in file.msg -noverify -pk7out > file.pk7
Dump the certificates in that file
openssl pkcs7 -print_certs -in file.pk7 > file.pem
Open the file in your favorite text editor and seperate out each certificate individually in to it's own file and import:
For each CA certificate that you want to trust:
smime_keys add_root file.pem
Note: You do not need to trust all intermediate CAs. You can simply trust the end-user certificate.
For the subject certificate that you want to add:
smime_keys add_cert file.pem
What I usually do is, in Eclipse preferences, I define an Installed JRE called "JDK X.Y.Z" and include tools.jar as part of it libraries. Then I change the project preferences to use that JRE "JDK X.Y.Z".
CONFLICT (rename/rename): Rename "will-be-renamed.txt"->"new-name-1.txt" in branch "HEAD" rename "will-be-renamed.txt"->"new-name-2.txt" in "branch2"
Automatic merge failed; fix conflicts and then commit the result.
If you want to keep one file, say new-name-2.txt:
git add new-name-2.txt
git rm new-name-1.txt will-be-renamed.txt
git commit
M. Califf, and R. Mooney. Proceedings of the sixteenth national conference on Artificial intelligence and the eleventh Innovative applications of artificial intelligence conference innovative applications of artificial intelligence, page 328--334. Menlo Park, CA, USA, American Association for Artificial Intelligence, (1999)
M. Carpuat, and D. Wu. Proceedings of the 43rd Annual Meeting on Association for Computational Linguistics, page 387--394. Stroudsburg, PA, USA, Association for Computational Linguistics, (2005)
W. Cavnar, and J. Trenkle. Proceedings of SDAIR-94, 3rd Annual Symposium on Document Analysis and Information Retrieval, page 161--175. Las Vegas, US, (1994)
Y. Chan, and D. Roth. Proceedings of the 49th Annual Meeting of the Association for Computational Linguistics: Human Language Technologies - Volume 1, page 551--560. Stroudsburg, PA, USA, Association for Computational Linguistics, (2011)
C. Christodoulopoulos, S. Goldwater, and M. Steedman. Proceedings of the 2010 Conference on Empirical Methods in Natural Language Processing, page 575--584. Stroudsburg, PA, USA, Association for Computational Linguistics, (2010)
F. Ciravegna. Proceedings of the 17th international joint conference on Artificial intelligence - Volume 2, page 1251--1256. San Francisco, CA, USA, Morgan Kaufmann Publishers Inc., (2001)
S. Cohen, and N. Smith. Proceedings of Human Language Technologies: The 2009 Annual Conference of the North American Chapter of the Association for Computational Linguistics, page 74--82. Stroudsburg, PA, USA, Association for Computational Linguistics, (2009)
S. Cohen, K. Stratos, M. Collins, D. Foster, and L. Ungar. Proceedings of the 50th Annual Meeting of the Association for Computational Linguistics (Volume 1: Long Papers), page 223--231. Jeju Island, Korea, Association for Computational Linguistics, (July 2012)
M. Collins. Proceedings of the ACL-02 conference on Empirical methods in natural language processing - Volume 10, page 1--8. Stroudsburg, PA, USA, Association for Computational Linguistics, (2002)
M. Collins. Proceedings of the eighth conference on European chapter of the Association for Computational Linguistics, page 16--23. Stroudsburg, PA, USA, Association for Computational Linguistics, (1997)
M. Collins, and N. Duffy. Advances in Neural Information Processing Systems 14 --- Proceedings of the 2001 Neural Information Processing Systems Conference (NIPS 2001), December 3-8, 2001, Vancouver, British Columbia, Canada, page 625--632. MIT Press, Cambridge, MA, USA, (2002)